Merge branch 'develop'

Author: stevehu

.gitignore

@@ -14,6 +14,7 @@ dist/
 *.zip
 *.bak
 *.versionsBackup
+dependency-reduced-pom.xml
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*

authorize/build.sh

@@ -1,17 +1,60 @@
 #!/bin/bash
 
+#
+# Purpose: Publish docker image new tag to docker hub.
+#
+# Author:  Dinesh Alapati, [email protected]
+#
+# Parameters:
+#   $1:  version
+#
+
 set -ex
 
-CURRENT_DIR="${PWD##*/}"
-IMAGE_NAME="networknt/oauth-$CURRENT_DIR"
-TAG="${1}"
+VERSION=$1
+IMAGE_NAME="networknt/oauth2-authorize"
+
+showHelp() {
+    echo " "
+    echo "Error: $1"
+    echo " "
+    echo "    build.sh [VERSION]"
+    echo " "
+    echo "    where [VERSION] version of the docker image that you want to publish (example: 0.0.1)"
+    echo " "
+    echo "    example 1: ./build.sh 0.0.1"
+    echo " "
+}
+
+build() {
+    echo "Building ..."
+    mvn clean install
+    echo "Successfully built!"
+}
+
+cleanup() {
+    if [[ "$(docker images -q $IMAGE_NAME 2> /dev/null)" != "" ]]; then
+        echo "Removing old $IMAGE_NAME images"
+        docker images | grep $IMAGE_NAME | awk '{print $3}' | xargs docker rmi -f
+        echo "Cleanup completed!"
+    fi
+}
+
+publish() {
+    echo "Building Docker image with version $VERSION"
+    docker build -t $IMAGE_NAME:$VERSION -t $IMAGE_NAME:latest -f ./docker/Dockerfile . --no-cache=true
+    docker build -t $IMAGE_NAME:$VERSION-redhat -f ./docker/Dockerfile-Redhat . --no-cache=true
+    echo "Images built with version $VERSION"
+    echo "Pushing image to DockerHub"
+    docker push $IMAGE_NAME
+    echo "Image successfully published!"
+}
 
-if docker inspect ${IMAGE_NAME} &> /dev/null; then
-	docker rmi -f ${IMAGE_NAME}:latest
-	docker rmi -f ${IMAGE_NAME}:${TAG}
+if [ -z $VERSION ]; then
+    showHelp "[VERSION] parameter is missing"
+    exit
 fi
 
-docker build -t ${IMAGE_NAME} .
-docker tag ${IMAGE_NAME} ${IMAGE_NAME}:latest
-docker tag ${IMAGE_NAME} ${IMAGE_NAME}:${TAG}
-docker push ${IMAGE_NAME}
+build;
+cleanup;
+publish;

authorize/dependency-reduced-pom.xml

@@ -0,0 +1,28 @@
+FROM registry.access.redhat.com/redhat-openjdk-18/openjdk18-openshift
+
+USER root
+
+ENV APP_DIR=/app \
+    GROUP_NAME=networknt \
+    GROUP_ID=1000 \
+    USER_NAME=networknt \
+    USER_UID=1000
+
+RUN groupadd -g ${GROUP_ID} -r ${GROUP_NAME} && \
+    useradd -u ${USER_UID} -g ${GROUP_NAME} -d "${APP_DIR}" -s /sbin/nologin -c "${USER_NAME} user" ${USER_NAME}
+
+# Add the jar file into the container at /app
+ADD target/oauth2-authorize.jar ${APP_DIR}/server.jar
+
+# change permissions of app directory
+RUN chown -R ${USER_NAME}:${GROUP_NAME} "${APP_DIR}"
+
+# Port available to the world outside of this container
+EXPOSE 6881
+
+USER ${USER_UID}
+
+# Set the working directory to /app
+WORKDIR ${APP_DIR}
+
+CMD ["/bin/sh","-c","java -Dlight-4j-config-dir=/config -Dlogback.configurationFile=/config/logback.xml -jar server.jar"]