fixes #188 update Dockerfile and build.sh to image publishing (#189)

stevehu · web-flow · commit 456af15e0d39 · 2019-07-09T15:37:20.000-04:00
diff --git a/authorize/build.sh b/authorize/build.sh
@@ -42,7 +42,7 @@ cleanup() {
 
 publish() {
     echo "Building Docker image with version $VERSION"
-    docker build -t $IMAGE_NAME:$VERSION -t $IMAGE_NAME:latest -f ./Dockerfile . --no-cache=true
+    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"
diff --git a/authorize/docker/Dockerfile b/authorize/docker/Dockerfile
diff --git a/authorize/docker/Dockerfile-Redhat b/authorize/docker/Dockerfile-Redhat
diff --git a/authorize/docker/Dockerfile-Slim b/authorize/docker/Dockerfile-Slim
@@ -0,0 +1,3 @@
+FROM openjdk:11.0.3-slim
+ADD target/oauth2-authorize.jar server.jar
+CMD ["/bin/sh","-c","java -Dlight-4j-config-dir=/config -Dlogback.configurationFile=/config/logback.xml -Djava.security.krb5.conf=/config/krb5.conf -jar /server.jar"]
diff --git a/client/build.sh b/client/build.sh
@@ -42,8 +42,8 @@ cleanup() {
 
 publish() {
     echo "Building Docker image with version $VERSION"
-    docker build -t $IMAGE_NAME:$VERSION -t $IMAGE_NAME:latest -f ./Dockerfile . --no-cache=true
-    docker build -t $IMAGE_NAME:$VERSION-redhat -f ./docker/Dockerfile-Redhat . --no-cache=true
+    docker build -t $IMAGE_NAME:$VERSION -t $IMAGE_NAME:latest -f ./docker/Dockerfile . --no-cache=true
+    docker build -t $IMAGE_NAME:$VERSION-slim -f ./docker/Dockerfile-Slim . --no-cache=true
     echo "Images built with version $VERSION"
     echo "Pushing image to DockerHub"
     docker push $IMAGE_NAME
diff --git a/client/docker/Dockerfile b/client/docker/Dockerfile
@@ -12,7 +12,7 @@ ENV JAVA_MINIMAL=/opt/jre
 RUN jlink \
     --verbose \
     --add-modules \
-        java.base,java.sql,java.naming,java.desktop,java.xml,jdk.crypto.cryptoki,jdk.unsupported,java.management \
+        java.base,java.sql,java.naming,java.desktop,java.xml,jdk.crypto.cryptoki,jdk.unsupported,java.management,java.security.jgss \
     --compress 2 \
     --strip-debug \
     --no-header-files \
diff --git a/client/docker/Dockerfile-Redhat b/client/docker/Dockerfile-Redhat
diff --git a/client/docker/Dockerfile-Slim b/client/docker/Dockerfile-Slim
@@ -0,0 +1,3 @@
+FROM openjdk:11.0.3-slim
+ADD target/oauth2-client.jar server.jar
+CMD ["/bin/sh","-c","java -Dlight-4j-config-dir=/config -Dlogback.configurationFile=/config/logback.xml -jar /server.jar"]
diff --git a/code/build.sh b/code/build.sh
@@ -42,8 +42,8 @@ cleanup() {
 
 publish() {
     echo "Building Docker image with version $VERSION"
-    docker build -t $IMAGE_NAME:$VERSION -t $IMAGE_NAME:latest -f ./Dockerfile . --no-cache=true
-    docker build -t $IMAGE_NAME:$VERSION-redhat -f ./docker/Dockerfile-Redhat . --no-cache=true
+    docker build -t $IMAGE_NAME:$VERSION -t $IMAGE_NAME:latest -f ./docker/Dockerfile . --no-cache=true
+    docker build -t $IMAGE_NAME:$VERSION-slim -f ./docker/Dockerfile-Slim . --no-cache=true
     echo "Images built with version $VERSION"
     echo "Pushing image to DockerHub"
     docker push $IMAGE_NAME
diff --git a/code/docker/Dockerfile b/code/docker/Dockerfile
diff --git a/code/docker/Dockerfile-Debug b/code/docker/Dockerfile-Debug
diff --git a/code/docker/Dockerfile-Redhat b/code/docker/Dockerfile-Redhat
diff --git a/code/docker/Dockerfile-Slim b/code/docker/Dockerfile-Slim
@@ -0,0 +1,3 @@
+FROM openjdk:11.0.3-slim
+ADD target/oauth2-code.jar server.jar
+CMD ["/bin/sh","-c","java -Dlight-4j-config-dir=/config -Dlogback.configurationFile=/config/logback.xml -Djava.security.krb5.conf=/config/krb5.conf -jar /server.jar"]
diff --git a/key/build.sh b/key/build.sh
@@ -42,8 +42,8 @@ cleanup() {
 
 publish() {
     echo "Building Docker image with version $VERSION"
-    docker build -t $IMAGE_NAME:$VERSION -t $IMAGE_NAME:latest -f ./Dockerfile . --no-cache=true
-    docker build -t $IMAGE_NAME:$VERSION-redhat -f ./docker/Dockerfile-Redhat . --no-cache=true
+    docker build -t $IMAGE_NAME:$VERSION -t $IMAGE_NAME:latest -f ./docker/Dockerfile . --no-cache=true
+    docker build -t $IMAGE_NAME:$VERSION-slim -f ./docker/Dockerfile-Slim . --no-cache=true
     echo "Images built with version $VERSION"
     echo "Pushing image to DockerHub"
     docker push $IMAGE_NAME
diff --git a/key/docker/Dockerfile b/key/docker/Dockerfile
@@ -12,7 +12,7 @@ ENV JAVA_MINIMAL=/opt/jre
 RUN jlink \
     --verbose \
     --add-modules \
-        java.base,java.sql,java.naming,java.desktop,java.xml,jdk.crypto.cryptoki,jdk.unsupported,java.management \
+        java.base,java.sql,java.naming,java.desktop,java.xml,jdk.crypto.cryptoki,jdk.unsupported,java.management,java.security.jgss \
     --compress 2 \
     --strip-debug \
     --no-header-files \
diff --git a/key/docker/Dockerfile-Redhat b/key/docker/Dockerfile-Redhat
diff --git a/key/docker/Dockerfile-Slim b/key/docker/Dockerfile-Slim
@@ -0,0 +1,3 @@
+FROM openjdk:11.0.3-slim
+ADD target/oauth2-key.jar server.jar
+CMD ["/bin/sh","-c","java -Dlight-4j-config-dir=/config -Dlogback.configurationFile=/config/logback.xml -jar /server.jar"]
diff --git a/provider/build.sh b/provider/build.sh
@@ -0,0 +1,60 @@
+#!/bin/bash
+
+#
+# Purpose: Publish docker image new tag to docker hub.
+#
+# Author:  Dinesh Alapati, dine.alapati@gmail.com
+#
+# Parameters:
+#   $1:  version
+#
+
+set -ex
+
+VERSION=$1
+IMAGE_NAME="networknt/oauth2-provider"
+
+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-slim -f ./docker/Dockerfile-Slim . --no-cache=true
+    echo "Images built with version $VERSION"
+    echo "Pushing image to DockerHub"
+    docker push $IMAGE_NAME
+    echo "Image successfully published!"
+}
+
+if [ -z $VERSION ]; then
+    showHelp "[VERSION] parameter is missing"
+    exit
+fi
+
+build;
+cleanup;
+publish;
diff --git a/provider/docker/Dockerfile b/provider/docker/Dockerfile
@@ -12,7 +12,7 @@ ENV JAVA_MINIMAL=/opt/jre
 RUN jlink \
     --verbose \
     --add-modules \
-        java.base,java.sql,java.naming,java.desktop,java.xml,jdk.crypto.cryptoki,jdk.unsupported,java.management \
+        java.base,java.sql,java.naming,java.desktop,java.xml,jdk.crypto.cryptoki,jdk.unsupported,java.management,java.security.jgss \
     --compress 2 \
     --strip-debug \
     --no-header-files \
diff --git a/provider/docker/Dockerfile-Redhat b/provider/docker/Dockerfile-Redhat
diff --git a/provider/docker/Dockerfile-Slim b/provider/docker/Dockerfile-Slim
@@ -0,0 +1,3 @@
+FROM openjdk:11.0.3-slim
+ADD target/oauth2-provider server.jar
+CMD ["/bin/sh","-c","java -Dlight-4j-config-dir=/config -Dlogback.configurationFile=/config/logback.xml -jar /server.jar"]
diff --git a/refresh-token/build.sh b/refresh-token/build.sh
@@ -42,8 +42,8 @@ cleanup() {
 
 publish() {
     echo "Building Docker image with version $VERSION"
-    docker build -t $IMAGE_NAME:$VERSION -t $IMAGE_NAME:latest -f ./Dockerfile . --no-cache=true
-    docker build -t $IMAGE_NAME:$VERSION-redhat -f ./docker/Dockerfile-Redhat . --no-cache=true
+    docker build -t $IMAGE_NAME:$VERSION -t $IMAGE_NAME:latest -f ./docker/Dockerfile . --no-cache=true
+    docker build -t $IMAGE_NAME:$VERSION-slim -f ./docker/Dockerfile-Slim . --no-cache=true
     echo "Images built with version $VERSION"
     echo "Pushing image to DockerHub"
     docker push $IMAGE_NAME
diff --git a/refresh-token/docker/Dockerfile b/refresh-token/docker/Dockerfile
@@ -12,7 +12,7 @@ ENV JAVA_MINIMAL=/opt/jre
 RUN jlink \
     --verbose \
     --add-modules \
-        java.base,java.sql,java.naming,java.desktop,java.xml,jdk.crypto.cryptoki,jdk.unsupported,java.management \
+        java.base,java.sql,java.naming,java.desktop,java.xml,jdk.crypto.cryptoki,jdk.unsupported,java.management,java.security.jgss \
     --compress 2 \
     --strip-debug \
     --no-header-files \
diff --git a/refresh-token/docker/Dockerfile-Redhat b/refresh-token/docker/Dockerfile-Redhat
diff --git a/refresh-token/docker/Dockerfile-Slim b/refresh-token/docker/Dockerfile-Slim
@@ -0,0 +1,3 @@
+FROM openjdk:11.0.3-slim
+ADD target/oauth2-refresh-token.jar server.jar
+CMD ["/bin/sh","-c","java -Dlight-4j-config-dir=/config -Dlogback.configurationFile=/config/logback.xml -jar /server.jar"]
diff --git a/service/build.sh b/service/build.sh
@@ -42,8 +42,8 @@ cleanup() {
 
 publish() {
     echo "Building Docker image with version $VERSION"
-    docker build -t $IMAGE_NAME:$VERSION -t $IMAGE_NAME:latest -f ./Dockerfile . --no-cache=true
-    docker build -t $IMAGE_NAME:$VERSION-redhat -f ./docker/Dockerfile-Redhat . --no-cache=true
+    docker build -t $IMAGE_NAME:$VERSION -t $IMAGE_NAME:latest -f ./docker/Dockerfile . --no-cache=true
+    docker build -t $IMAGE_NAME:$VERSION-slim -f ./docker/Dockerfile-Slim . --no-cache=true
     echo "Images built with version $VERSION"
     echo "Pushing image to DockerHub"
     docker push $IMAGE_NAME
diff --git a/service/docker/Dockerfile b/service/docker/Dockerfile
@@ -12,7 +12,7 @@ ENV JAVA_MINIMAL=/opt/jre
 RUN jlink \
     --verbose \
     --add-modules \
-        java.base,java.sql,java.naming,java.desktop,java.xml,jdk.crypto.cryptoki,jdk.unsupported,java.management \
+        java.base,java.sql,java.naming,java.desktop,java.xml,jdk.crypto.cryptoki,jdk.unsupported,java.management,java.security.jgss \
     --compress 2 \
     --strip-debug \
     --no-header-files \
diff --git a/service/docker/Dockerfile-Redhat b/service/docker/Dockerfile-Redhat
diff --git a/service/docker/Dockerfile-Slim b/service/docker/Dockerfile-Slim
@@ -0,0 +1,3 @@
+FROM openjdk:11.0.3-slim
+ADD target/oauth2-service.jar server.jar
+CMD ["/bin/sh","-c","java -Dlight-4j-config-dir=/config -Dlogback.configurationFile=/config/logback.xml -jar /server.jar"]
diff --git a/token/build.sh b/token/build.sh
@@ -42,8 +42,8 @@ cleanup() {
 
 publish() {
     echo "Building Docker image with version $VERSION"
-    docker build -t $IMAGE_NAME:$VERSION -t $IMAGE_NAME:latest -f ./Dockerfile . --no-cache=true
-    docker build -t $IMAGE_NAME:$VERSION-redhat -f ./docker/Dockerfile-Redhat . --no-cache=true
+    docker build -t $IMAGE_NAME:$VERSION -t $IMAGE_NAME:latest -f ./docker/Dockerfile . --no-cache=true
+    docker build -t $IMAGE_NAME:$VERSION-slim -f ./docker/Dockerfile-Slim . --no-cache=true
     echo "Images built with version $VERSION"
     echo "Pushing image to DockerHub"
     docker push $IMAGE_NAME
diff --git a/token/docker/Dockerfile b/token/docker/Dockerfile
@@ -12,7 +12,7 @@ ENV JAVA_MINIMAL=/opt/jre
 RUN jlink \
     --verbose \
     --add-modules \
-        java.base,java.sql,java.naming,java.desktop,java.xml,jdk.crypto.cryptoki,jdk.unsupported,java.management \
+        java.base,java.sql,java.naming,java.desktop,java.xml,jdk.crypto.cryptoki,jdk.unsupported,java.management,java.security.jgss \
     --compress 2 \
     --strip-debug \
     --no-header-files \
diff --git a/token/docker/Dockerfile-Redhat b/token/docker/Dockerfile-Redhat
diff --git a/token/docker/Dockerfile-Slim b/token/docker/Dockerfile-Slim
@@ -0,0 +1,3 @@
+FROM openjdk:11.0.3-slim
+ADD target/oauth2-token.jar server.jar
+CMD ["/bin/sh","-c","java -Dlight-4j-config-dir=/config -Dlogback.configurationFile=/config/logback.xml -jar /server.jar"]
diff --git a/user/build.sh b/user/build.sh
@@ -42,8 +42,8 @@ cleanup() {
 
 publish() {
     echo "Building Docker image with version $VERSION"
-    docker build -t $IMAGE_NAME:$VERSION -t $IMAGE_NAME:latest -f ./Dockerfile . --no-cache=true
-    docker build -t $IMAGE_NAME:$VERSION-redhat -f ./docker/Dockerfile-Redhat . --no-cache=true
+    docker build -t $IMAGE_NAME:$VERSION -t $IMAGE_NAME:latest -f ./docker/Dockerfile . --no-cache=true
+    docker build -t $IMAGE_NAME:$VERSION-slim -f ./docker/Dockerfile-Slim . --no-cache=true
     echo "Images built with version $VERSION"
     echo "Pushing image to DockerHub"
     docker push $IMAGE_NAME
diff --git a/user/docker/Dockerfile b/user/docker/Dockerfile
@@ -12,7 +12,7 @@ ENV JAVA_MINIMAL=/opt/jre
 RUN jlink \
     --verbose \
     --add-modules \
-        java.base,java.sql,java.naming,java.desktop,java.xml,jdk.crypto.cryptoki,jdk.unsupported,java.management \
+        java.base,java.sql,java.naming,java.desktop,java.xml,jdk.crypto.cryptoki,jdk.unsupported,java.management,java.security.jgss \
     --compress 2 \
     --strip-debug \
     --no-header-files \
diff --git a/user/docker/Dockerfile-Redhat b/user/docker/Dockerfile-Redhat
diff --git a/user/docker/Dockerfile-Slim b/user/docker/Dockerfile-Slim
@@ -0,0 +1,3 @@
+FROM openjdk:11.0.3-slim
+ADD target/oauth2-user.jar server.jar
+CMD ["/bin/sh","-c","java -Dlight-4j-config-dir=/config -Dlogback.configurationFile=/config/logback.xml -jar /server.jar"]

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+FROM openjdk:11.0.3-slim`
	`2`	`+ADD target/oauth2-authorize.jar server.jar`
	`3`	`+CMD ["/bin/sh","-c","java -Dlight-4j-config-dir=/config -Dlogback.configurationFile=/config/logback.xml -Djava.security.krb5.conf=/config/krb5.conf -jar /server.jar"]`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+FROM openjdk:11.0.3-slim`
	`2`	`+ADD target/oauth2-client.jar server.jar`
	`3`	`+CMD ["/bin/sh","-c","java -Dlight-4j-config-dir=/config -Dlogback.configurationFile=/config/logback.xml -jar /server.jar"]`