Merge pull request #241 from aguibert/testcontainers-1.15.0

aguibert · web-flow · commit 92925ea3b2c9 · 2020-11-17T09:06:27.000-06:00
Upgrade to Testcontianers 1.15.0
diff --git a/.github/workflows/microshed-ci.yml b/.github/workflows/microshed-ci.yml
@@ -14,7 +14,7 @@ on:
       - '.github/ISSUE_TEMPLATE/**'
 
 env:
-  LANG: en_US
+  LANG: en_US.UTF-8
 jobs:
   build:
     runs-on: ubuntu-latest
diff --git a/modules/payara-micro/src/main/java/org/testcontainers/containers/payara/PayaraMicroAdapter.java b/modules/payara-micro/src/main/java/org/testcontainers/containers/payara/PayaraMicroAdapter.java
@@ -47,11 +47,11 @@ public ImageFromDockerfile getDefaultImage(File appFile) {
         // Compose a docker image equivalent to doing:
         // FROM payara/micro:5.193
         // CMD ["--deploymentDir", "/opt/payara/deployments", "--noCluster"]
-        // ADD target/myservice.war /opt/payara/deployments
+        // ADD target/myservice.war /opt/payara/deployments/
         ImageFromDockerfile image = new ImageFromDockerfile()
                 .withDockerfileFromBuilder(builder -> builder.from("payara/micro:5.193")
-                        .cmd("--deploymentDir", "/opt/payara/deployments", "--noCluster")
-                        .add(appName, "/opt/payara/deployments")
+                        .cmd("--deploymentDir", "/opt/payara/deployments/", "--noCluster")
+                        .add(appName, "/opt/payara/deployments/")
                         .build())
                 .withFileFromFile(appName, appFile);
         return image;
diff --git a/modules/payara-server/src/main/java/org/testcontainers/containers/payara/PayaraServerAdapter.java b/modules/payara-server/src/main/java/org/testcontainers/containers/payara/PayaraServerAdapter.java
@@ -46,10 +46,10 @@ public ImageFromDockerfile getDefaultImage(File appFile) {
         String appName = appFile.getName();
         // Compose a docker image equivalent to doing:
         // FROM payara/server-full:5.193
-        // ADD target/myservice.war /opt/payara/deployments
+        // ADD target/myservice.war /opt/payara/deployments/
         ImageFromDockerfile image = new ImageFromDockerfile()
                 .withDockerfileFromBuilder(builder -> builder.from("payara/server-full:5.193")
-                        .add(appName, "/opt/payara/deployments")
+                        .add(appName, "/opt/payara/deployments/")
                         .build())
                 .withFileFromFile(appName, appFile);
         return image;
diff --git a/modules/testcontainers/build.gradle b/modules/testcontainers/build.gradle
@@ -16,10 +16,10 @@ sourceSets {
 
 dependencies {
   compile project(':microshed-testing-core')
-  compile 'org.testcontainers:junit-jupiter:1.15.0-rc2'
+  compile 'org.testcontainers:junit-jupiter:1.15.0'
   testCompile 'org.eclipse.microprofile.rest.client:microprofile-rest-client-api:1.4.1'
   testCompile 'org.slf4j:slf4j-log4j12:1.7.30'
-  testCompile 'org.testcontainers:mockserver:1.15.0-rc2'
+  testCompile 'org.testcontainers:mockserver:1.15.0'
   testImplementation 'org.junit.jupiter:junit-jupiter:5.7.0'
 }
 
diff --git a/modules/wildfly/src/main/java/org/testcontainers/containers/wildfly/WildFlyAdapter.java b/modules/wildfly/src/main/java/org/testcontainers/containers/wildfly/WildFlyAdapter.java
@@ -45,10 +45,10 @@ public ImageFromDockerfile getDefaultImage(File appFile) {
         String appName = appFile.getName();
         // Compose a docker image equivalent to doing:
         // FROM jboss/wildfly:18.0.1.Final
-        // ADD target/myservice.war /opt/jboss/wildfly/standalone/deployments
+        // ADD target/myservice.war /opt/jboss/wildfly/standalone/deployments/
         ImageFromDockerfile image = new ImageFromDockerfile()
                 .withDockerfileFromBuilder(builder -> builder.from("jboss/wildfly:18.0.1.Final")
-                        .add(appName, "/opt/jboss/wildfly/standalone/deployments")
+                        .add(appName, "/opt/jboss/wildfly/standalone/deployments/")
                         .build())
                 .withFileFromFile(appName, appFile);
         return image;
diff --git a/sample-apps/everything-app/Dockerfile b/sample-apps/everything-app/Dockerfile
@@ -1,7 +1,7 @@
 # OpenLiberty
 FROM openliberty/open-liberty:full-java8-openj9-ubi
 COPY src/main/liberty/config /config/
-ADD build/libs/myservice.war /config/dropins
+ADD build/libs/myservice.war /config/dropins/
 
 # Wildfly
 #FROM jboss/wildfly
diff --git a/sample-apps/everything-app/build.gradle b/sample-apps/everything-app/build.gradle
@@ -8,7 +8,7 @@ dependencies {
   compile group: 'org.mongodb', name: 'mongo-java-driver', version: '3.11.2'
   testCompile project(':microshed-testing-testcontainers')
   testCompile group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.29'
-  testCompile 'org.testcontainers:mockserver:1.15.0-rc2'
+  testCompile 'org.testcontainers:mockserver:1.15.0'
   testCompile 'org.mock-server:mockserver-client-java:5.5.4'
   testCompile 'io.rest-assured:rest-assured:4.2.0'
   testImplementation 'org.junit.jupiter:junit-jupiter:5.6.0'
diff --git a/sample-apps/jaxrs-basicauth/Dockerfile b/sample-apps/jaxrs-basicauth/Dockerfile
@@ -1,7 +1,7 @@
 # OpenLiberty
 FROM openliberty/open-liberty:full-java8-openj9-ubi
 COPY src/main/liberty/config /config/
-ADD build/libs/myservice.war /config/apps
+ADD build/libs/myservice.war /config/apps/
 
 # Wildfly
 #FROM jboss/wildfly
diff --git a/sample-apps/jaxrs-json/Dockerfile b/sample-apps/jaxrs-json/Dockerfile
@@ -1,7 +1,7 @@
 # OpenLiberty
 FROM openliberty/open-liberty:full-java8-openj9-ubi
 COPY src/main/liberty/config /config/
-ADD build/libs/myservice.war /config/dropins
+ADD build/libs/myservice.war /config/dropins/
 
 # Wildfly
 #FROM jboss/wildfly
diff --git a/sample-apps/jaxrs-mpjwt/Dockerfile b/sample-apps/jaxrs-mpjwt/Dockerfile
@@ -1,7 +1,7 @@
 # OpenLiberty
 FROM openliberty/open-liberty:full-java8-openj9-ubi
 COPY src/main/liberty/config /config/
-ADD build/libs/myservice.war /config/dropins
+ADD build/libs/myservice.war /config/dropins/
 
 # Wildfly
 #FROM jboss/wildfly
diff --git a/sample-apps/jdbc-app/build.gradle b/sample-apps/jdbc-app/build.gradle
@@ -9,7 +9,7 @@ configurations {
 dependencies {
   providedCompile 'javax:javaee-api:8.0.1'
   providedCompile 'org.eclipse.microprofile:microprofile:2.1'
-  testCompile 'org.testcontainers:postgresql:1.15.0-rc2'
+  testCompile 'org.testcontainers:postgresql:1.15.0'
   testCompile group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.29'
   testCompile project(':microshed-testing-testcontainers')
   testImplementation 'org.junit.jupiter:junit-jupiter:5.6.0'
diff --git a/sample-apps/jdbc-app/src/main/docker/Dockerfile b/sample-apps/jdbc-app/src/main/docker/Dockerfile
@@ -1,4 +1,4 @@
 # OpenLiberty
 FROM openliberty/open-liberty:full-java8-openj9-ubi
 COPY src/main/liberty/config /config
-ADD build/libs/myservice.war /config/dropins
+ADD build/libs/myservice.war /config/dropins/
diff --git a/sample-apps/kafka-app/Dockerfile b/sample-apps/kafka-app/Dockerfile
@@ -1,5 +1,5 @@
 # OpenLiberty
 FROM openliberty/open-liberty:full-java8-openj9-ubi
 COPY src/main/liberty/config /config/
-ADD build/libs/myservice.war /config/apps
+ADD build/libs/myservice.war /config/apps/
 
diff --git a/sample-apps/kafka-app/build.gradle b/sample-apps/kafka-app/build.gradle
@@ -9,7 +9,7 @@ dependencies {
   compile 'org.apache.kafka:kafka-clients:2.4.0'
   testCompile project(':microshed-testing-testcontainers')
   testCompile 'org.awaitility:awaitility:4.0.2'
-  testCompile 'org.testcontainers:kafka:1.15.0-rc2'
+  testCompile 'org.testcontainers:kafka:1.15.0'
   testCompile 'org.slf4j:slf4j-log4j12:1.7.29'
   testImplementation 'org.junit.jupiter:junit-jupiter:5.6.0'
 }
diff --git a/sample-apps/maven-app/Dockerfile b/sample-apps/maven-app/Dockerfile
@@ -1,6 +1,6 @@
 FROM openliberty/open-liberty:full-java8-openj9-ubi
 COPY src/main/liberty/config /config/
-ADD target/myservice.war /config/dropins
+ADD target/myservice.war /config/dropins/
 
 # Wildfly
 #FROM jboss/wildfly
diff --git a/sample-apps/quarkus-app/pom.xml b/sample-apps/quarkus-app/pom.xml
@@ -88,7 +88,7 @@
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>postgresql</artifactId>
-      <version>1.15.0-rc2</version>
+      <version>1.15.0</version>
       <scope>test</scope>
     </dependency>
     <!-- 
