Cleans Dockerfiles

MicroShed · Nov 7, 2023 · 8a47f3e · 8a47f3e
1 parent 88392d9
commit 8a47f3e
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 74 deletions.
diff --git a/.github/workflows/microshed-ci.yml b/.github/workflows/microshed-ci.yml
@@ -51,6 +51,7 @@ jobs:
         include:
           - category: JAXRS
             projects: >
+              jaxrs-json
               jaxrs-basicauth
               jaxrs-mpjwt
               everything-app

diff --git a/sample-apps/everything-app/Dockerfile b/sample-apps/everything-app/Dockerfile
@@ -1,17 +1,3 @@
-# OpenLiberty
 FROM openliberty/open-liberty:full-java8-openj9-ubi
 COPY src/main/liberty/config /config/
-ADD build/libs/myservice.war /config/dropins/
-
-# Wildfly
-#FROM jboss/wildfly
-#ADD build/libs/myservice.war /opt/jboss/wildfly/standalone/deployments/
-
-# Payara
-#FROM payara/micro:5.193
-#CMD ["--deploymentDir", "/opt/payara/deployments", "--noCluster"]
-#ADD build/libs/myservice.war /opt/payara/deployments
-
-# TomEE (not working yet)
-#FROM tomee:8-jre-8.0.0-M2-microprofile
-#COPY build/libs/myservice.war /usr/local/tomee/webapps/
+ADD build/libs/myservice.war /config/dropins/
diff --git a/sample-apps/jaxrs-basicauth/Dockerfile b/sample-apps/jaxrs-basicauth/Dockerfile
@@ -1,17 +1,3 @@
-# OpenLiberty
 FROM openliberty/open-liberty:full-java8-openj9-ubi
 COPY src/main/liberty/config /config/
-ADD build/libs/myservice.war /config/apps/
-
-# Wildfly
-#FROM jboss/wildfly
-#ADD build/libs/myservice.war /opt/jboss/wildfly/standalone/deployments/
-
-# Payara
-#FROM payara/micro:5.193
-#CMD ["--deploymentDir", "/opt/payara/deployments", "--noCluster"]
-#ADD build/libs/myservice.war /opt/payara/deployments
-
-# TomEE
-#FROM tomee:8-jre-8.0.0-M2-microprofile
-#COPY build/libs/myservice.war /usr/local/tomee/webapps/
+ADD build/libs/myservice.war /config/apps/
diff --git a/sample-apps/jaxrs-json/Dockerfile b/sample-apps/jaxrs-json/Dockerfile
@@ -1,17 +1,3 @@
-# OpenLiberty
 FROM openliberty/open-liberty:full-java8-openj9-ubi
 COPY src/main/liberty/config /config/
-ADD build/libs/myservice.war /config/dropins/
-
-# Wildfly
-#FROM jboss/wildfly
-#ADD build/libs/myservice.war /opt/jboss/wildfly/standalone/deployments/
-
-# Payara
-#FROM payara/micro:5.193
-#CMD ["--deploymentDir", "/opt/payara/deployments", "--noCluster"]
-#ADD build/libs/myservice.war /opt/payara/deployments
-
-# TomEE
-#FROM tomee:8-jre-8.0.0-M2-microprofile
-#COPY build/libs/myservice.war /usr/local/tomee/webapps/
+ADD build/libs/myservice.war /config/dropins/
diff --git a/sample-apps/jaxrs-mpjwt/Dockerfile b/sample-apps/jaxrs-mpjwt/Dockerfile
@@ -1,17 +1,3 @@
-# OpenLiberty
 FROM openliberty/open-liberty:full-java8-openj9-ubi
 COPY src/main/liberty/config /config/
-ADD build/libs/myservice.war /config/dropins/
-
-# Wildfly
-#FROM jboss/wildfly
-#ADD build/libs/myservice.war /opt/jboss/wildfly/standalone/deployments/
-
-# Payara
-#FROM payara/micro:5.193
-#CMD ["--deploymentDir", "/opt/payara/deployments", "--noCluster"]
-#ADD build/libs/myservice.war /opt/payara/deployments
-
-# TomEE
-#FROM tomee:8-jre-8.0.0-M2-microprofile
-#COPY build/libs/myservice.war /usr/local/tomee/webapps/
+ADD build/libs/myservice.war /config/dropins/
diff --git a/sample-apps/kafka-app/Dockerfile b/sample-apps/kafka-app/Dockerfile
@@ -1,4 +1,3 @@
-# OpenLiberty
 FROM openliberty/open-liberty:full-java8-openj9-ubi
 COPY src/main/liberty/config /config/
 ADD build/libs/myservice.war /config/apps/

diff --git a/sample-apps/maven-app/Dockerfile b/sample-apps/maven-app/Dockerfile
@@ -1,16 +1,3 @@
 FROM openliberty/open-liberty:full-java8-openj9-ubi
 COPY src/main/liberty/config /config/
 ADD target/myservice.war /config/dropins/
-
-# Wildfly
-#FROM jboss/wildfly
-#ADD target/myservice.war /opt/jboss/wildfly/standalone/deployments/
-
-# Payara
-#FROM payara/micro:5.193
-#CMD ["--deploymentDir", "/opt/payara/deployments", "--noCluster"]
-#ADD target/myservice.war /opt/payara/deployments
-
-# TomEE
-#FROM tomee:8-jre-8.0.0-M2-microprofile
-#COPY target/myservice.war /usr/local/tomee/webapps/