update jboss eap in Dockerfile

daggerok · daggerok · commit 3441af69d57a · 2018-03-10T21:31:01.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -14,3 +14,4 @@ overlays
 .classpath
 .project
 .settings
+kotlin-jboss4-jaxrs
diff --git a/ear/Dockerfile b/ear/Dockerfile
@@ -1,4 +1,4 @@
-FROM daggerok/jboss-eap-6.4:alpine
+FROM daggerok/jboss:eap-6.4:alpine
 RUN echo "JAVA_OPTS=\"\$JAVA_OPTS -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 \"" >> ${JBOSS_HOME}/bin/standalone.conf
 EXPOSE 5005 8081
 ADD ./ear/target/*.ear ${JBOSS_HOME}/standalone/deployments/
diff --git a/ejb-2-starter/Dockerfile b/ejb-2-starter/Dockerfile
@@ -1,4 +1,4 @@
-FROM daggerok/jboss-eap-6.4:alpine
+FROM daggerok/jboss:eap-6.4:alpine
 RUN echo "JAVA_OPTS=\"\$JAVA_OPTS -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 \"" >> ${JBOSS_HOME}/bin/standalone.conf
 EXPOSE 5005 8081
 ADD ./ear/target/*.ear ${JBOSS_HOME}/standalone/deployments/
diff --git a/ejb-2/Dockerfile b/ejb-2/Dockerfile
@@ -1,4 +1,4 @@
-FROM daggerok/jboss-eap-6.4:alpine
+FROM daggerok/jboss:eap-6.4:alpine
 RUN echo "JAVA_OPTS=\"\$JAVA_OPTS -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 \"" >> ${JBOSS_HOME}/bin/standalone.conf
 EXPOSE 5005 8081
 ADD ./ear/target/*.ear ${JBOSS_HOME}/standalone/deployments/
diff --git a/ejb-3-java-ee-7/Dockerfile b/ejb-3-java-ee-7/Dockerfile
@@ -1,4 +1,4 @@
-FROM daggerok/jboss-eap-6.4:alpine
+FROM daggerok/jboss:eap-6.4:alpine
 RUN echo "JAVA_OPTS=\"\$JAVA_OPTS -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 \"" >> ${JBOSS_HOME}/bin/standalone.conf
 EXPOSE 5005 8081
 ADD ./ear/target/*.ear ${JBOSS_HOME}/standalone/deployments/
diff --git a/ejb-3-starter/Dockerfile b/ejb-3-starter/Dockerfile
@@ -1,4 +1,4 @@
-FROM daggerok/jboss-eap-6.4:alpine
+FROM daggerok/jboss:eap-6.4:alpine
 RUN echo "JAVA_OPTS=\"\$JAVA_OPTS -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 \"" >> ${JBOSS_HOME}/bin/standalone.conf
 EXPOSE 5005 8081
 ADD ./ear/target/*.ear ${JBOSS_HOME}/standalone/deployments/
diff --git a/ejb-stateful-singleton/Dockerfile b/ejb-stateful-singleton/Dockerfile
@@ -1,4 +1,4 @@
-FROM daggerok/jboss-eap-6.4:alpine
+FROM daggerok/jboss:eap-6.4:alpine
 RUN echo "JAVA_OPTS=\"\$JAVA_OPTS -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 \"" >> ${JBOSS_HOME}/bin/standalone.conf
 EXPOSE 5005 8081
 ADD ./ear/target/*.ear ${JBOSS_HOME}/standalone/deployments/
diff --git a/glassfish-ext.js/dockerfiles/Dockerfile-daggerok-jboss-eap-6.4 b/glassfish-ext.js/dockerfiles/Dockerfile-daggerok-jboss-eap-6.4
@@ -1,4 +1,4 @@
-FROM daggerok/jboss-eap-6.4:v2
+FROM daggerok/jboss:eap-6.4:v2
 
 # admin user is already defined in base image
 RUN ${JBOSS_HOME}/bin/add-user.sh mak Admin.123 --silent
diff --git a/glassfish-ext.js/dockerfiles/Dockerfile-daggerok-jboss-eap-6.4-alpine b/glassfish-ext.js/dockerfiles/Dockerfile-daggerok-jboss-eap-6.4-alpine
@@ -1,4 +1,4 @@
-FROM daggerok/jboss-eap-6.4:alpine
+FROM daggerok/jboss:eap-6.4:alpine
 MAINTAINER Maksim Kostromin https://github.com/daggerok/docker
 
 HEALTHCHECK --interval=1s --timeout=3s --retries=30 \
diff --git a/java-ee-7-docker-jboss-eap-6.4-quickstart/Dockerfile b/java-ee-7-docker-jboss-eap-6.4-quickstart/Dockerfile
@@ -1,2 +1,2 @@
-FROM daggerok/jboss-eap-6.4:v1
+FROM daggerok/jboss:eap-6.4
 ADD target/*.war "${JBOSS_HOME}/standalone/deployments/app.war"
diff --git a/jboss-eap-ext.js/Dockerfile b/jboss-eap-ext.js/Dockerfile
@@ -1,4 +1,4 @@
-FROM daggerok/jboss-eap-6.4:alpine
+FROM daggerok/jboss:eap-6.4:alpine
 MAINTAINER Maksim Kostromin https://github.com/daggerok/docker
 
 # check all apps healthy (in current example we are expecting to have apps with /ui/ and /rest-api/ contexts deployed:
diff --git a/jboss-eap-ext.js/dockerfiles/Dockerfile-daggerok-jboss-eap-6.4 b/jboss-eap-ext.js/dockerfiles/Dockerfile-daggerok-jboss-eap-6.4
@@ -1,4 +1,4 @@
-FROM daggerok/jboss-eap-6.4:v2
+FROM daggerok/jboss:eap-6.4:v2
 
 # admin user is already defined in base image
 RUN ${JBOSS_HOME}/bin/add-user.sh mak Admin.123 --silent
diff --git a/jboss-eap-ext.js/dockerfiles/Dockerfile-daggerok-jboss-eap-6.4-alpine b/jboss-eap-ext.js/dockerfiles/Dockerfile-daggerok-jboss-eap-6.4-alpine
@@ -1,4 +1,4 @@
-FROM daggerok/jboss-eap-6.4:alpine
+FROM daggerok/jboss:eap-6.4:alpine
 MAINTAINER Maksim Kostromin https://github.com/daggerok/docker
 
 # check all apps healthy (in current example we are expecting to have apps with /ui/ and /rest-api/ contexts deployed:
diff --git a/jboss-eap-h2-cdi/Dockerfile b/jboss-eap-h2-cdi/Dockerfile
@@ -1,4 +1,4 @@
-FROM daggerok/jboss-eap-6.4:alpine
+FROM daggerok/jboss:eap-6.4:alpine
 RUN echo "JAVA_OPTS=\"\$JAVA_OPTS -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 \"" >> ${JBOSS_HOME}/bin/standalone.conf
 EXPOSE 5005 8081
 ADD ./ear/target/*.ear ${JBOSS_HOME}/standalone/deployments/
diff --git a/jboss-eap-h2-ejb/Dockerfile b/jboss-eap-h2-ejb/Dockerfile
@@ -1,4 +1,4 @@
-FROM daggerok/jboss-eap-6.4:alpine
+FROM daggerok/jboss:eap-6.4:alpine
 RUN echo "JAVA_OPTS=\"\$JAVA_OPTS -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 \"" >> ${JBOSS_HOME}/bin/standalone.conf
 EXPOSE 5005 8081
 ADD ./ear/target/*.ear ${JBOSS_HOME}/standalone/deployments/
diff --git a/kotlin-javaee-cdi-h2/.mvn/Dockerfile b/kotlin-javaee-cdi-h2/.mvn/Dockerfile
@@ -1,4 +1,4 @@
-FROM daggerok/jboss-eap-6.4
+FROM daggerok/jboss:eap-6.4
 RUN echo "JAVA_OPTS=\"\$JAVA_OPTS -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 \"" >> ${JBOSS_HOME}/bin/standalone.conf
 EXPOSE 5005
 ADD ./target/*.war ${JBOSS_HOME}/standalone/deployments/
diff --git a/kotlin-javaee-cdi-h2/gradle/Dockerfile b/kotlin-javaee-cdi-h2/gradle/Dockerfile
@@ -1,4 +1,4 @@
-FROM daggerok/jboss-eap-7.1
+FROM daggerok/jboss:eap-7.1
 RUN echo "JAVA_OPTS=\"\$JAVA_OPTS -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 \"" >> ${JBOSS_HOME}/bin/standalone.conf
 EXPOSE 5005
 ADD ./build/libs/*.war ${JBOSS_HOME}/standalone/deployments/
diff --git a/plain-http-servlet/docker/maven/Dockerfile b/plain-http-servlet/docker/maven/Dockerfile
@@ -1,4 +1,4 @@
-FROM daggerok/jboss-eap-7.1:alpine
+FROM daggerok/jboss:eap-7.1:alpine
 RUN echo "JAVA_OPTS=\"\$JAVA_OPTS -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 \"" >> ${JBOSS_HOME}/bin/standalone.conf
 EXPOSE 5005
 HEALTHCHECK --interval=1s --timeout=3s --retries=30 \
diff --git a/timer-async-ejb/Dockerfile b/timer-async-ejb/Dockerfile
@@ -1,4 +1,4 @@
-FROM daggerok/jboss-eap-6.4:alpine
+FROM daggerok/jboss:eap-6.4:alpine
 RUN echo "JAVA_OPTS=\"\$JAVA_OPTS -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 \"" >> ${JBOSS_HOME}/bin/standalone.conf
 EXPOSE 5005 8081
 ADD ./ear/target/*.ear ${JBOSS_HOME}/standalone/deployments/
diff --git a/timer/Dockerfile b/timer/Dockerfile
@@ -1,4 +1,4 @@
-FROM daggerok/jboss-eap-6.4:alpine
+FROM daggerok/jboss:eap-6.4:alpine
 RUN echo "JAVA_OPTS=\"\$JAVA_OPTS -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 \"" >> ${JBOSS_HOME}/bin/standalone.conf
 EXPOSE 5005 8081
 ADD ./ear/target/*.ear ${JBOSS_HOME}/standalone/deployments/
diff --git a/xmlrpc/Dockerfile b/xmlrpc/Dockerfile
@@ -1,4 +1,4 @@
-FROM daggerok/jboss-eap-6.4:alpine
+FROM daggerok/jboss:eap-6.4:alpine
 RUN echo "JAVA_OPTS=\"\$JAVA_OPTS -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 \"" >> ${JBOSS_HOME}/bin/standalone.conf
 EXPOSE 5005 8081
 ADD ./server/target/*.war ./client/target/*.war ${JBOSS_HOME}/standalone/deployments/

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM daggerok/jboss-eap-6.4:alpine`
	`1`	`+FROM daggerok/jboss:eap-6.4:alpine`
`2`	`2`	`RUN echo "JAVA_OPTS=\"\$JAVA_OPTS -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 \"" >> ${JBOSS_HOME}/bin/standalone.conf`
`3`	`3`	`EXPOSE 5005 8081`
`4`	`4`	`ADD ./ear/target/*.ear ${JBOSS_HOME}/standalone/deployments/`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM daggerok/jboss-eap-6.4:v2`
	`1`	`+FROM daggerok/jboss:eap-6.4:v2`
`2`	`2`
`3`	`3`	`# admin user is already defined in base image`
`4`	`4`	`RUN ${JBOSS_HOME}/bin/add-user.sh mak Admin.123 --silent`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-FROM daggerok/jboss-eap-6.4:v1`
	`1`	`+FROM daggerok/jboss:eap-6.4`
`2`	`2`	`ADD target/*.war "${JBOSS_HOME}/standalone/deployments/app.war"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM daggerok/jboss-eap-7.1:alpine`
	`1`	`+FROM daggerok/jboss:eap-7.1:alpine`
`2`	`2`	`RUN echo "JAVA_OPTS=\"\$JAVA_OPTS -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 \"" >> ${JBOSS_HOME}/bin/standalone.conf`
`3`	`3`	`EXPOSE 5005`
`4`	`4`	`HEALTHCHECK --interval=1s --timeout=3s --retries=30 \`