Merge pull request #24 from kekru/development

update nginx version to 1.26.2

Author: kekru

.github/workflows/push.yml

@@ -4,16 +4,19 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout repository
+        uses: actions/checkout@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
       - name: Build
         env:
           COMPOSE_DOCKER_CLI_BUILD: 1
           DOCKER_BUILDKIT: 1
           COMPOSE_PROJECT_NAME: test
-        run: cd test && mkdir -p target/integr-test && echo "" > target/integr-test/remote-api.env && docker-compose build
+        run: cd test && mkdir -p target/integr-test && echo "" > target/integr-test/remote-api.env && docker compose build
       - name: Test
         env:
           COMPOSE_DOCKER_CLI_BUILD: 1
           DOCKER_BUILDKIT: 1
           COMPOSE_PROJECT_NAME: test
-        run: cd test && docker-compose run test
+        run: cd test && docker compose run test

Dockerfile

@@ -1,5 +1,5 @@
 # Original Dockerfile: https://github.com/nginxinc/docker-nginx/blob/b0e153a1b644ca8b2bd378b14913fff316e07cf2/stable/alpine/Dockerfile
-FROM nginx:1.20.2-alpine
+FROM nginx:1.26.2-alpine
 LABEL MAINTAINER="Kevin Krummenauer <[email protected]>"
 RUN apk add --no-cache openssl
 
@@ -19,4 +19,4 @@ HEALTHCHECK --start-period=1s \
             --interval=5s \
             --timeout=5s \
             --retries=12 \
-            CMD nc -vz localhost 443 || exit 1
+            CMD nc -vz 127.0.0.1 443 || exit 1

README.md

@@ -29,7 +29,7 @@ Create a docker-compose.yml file:
 version: "3.4"
 services:
   remote-api:
-    image: kekru/docker-remote-api-tls:v0.4.0
+    image: kekru/docker-remote-api-tls:v0.5.0
     ports:
      - 2376:443
     volumes:
@@ -49,7 +49,7 @@ Create a docker-compose.yml file, specifying a password and the hostname, on whi
 version: "3.4"
 services:
   remote-api:
-    image: kekru/docker-remote-api-tls:v0.4.0
+    image: kekru/docker-remote-api-tls:v0.5.0
     ports:
      - 2376:443
     environment:
@@ -121,3 +121,7 @@ Thanks [@benkorichard](https://github.com/benkorichard) for contributing!
 #### v0.4.0
 
 + update nginx version to 1.20.2
+
+#### v0.5.0
+
++ update nginx version to 1.26.2

docker-compose.yml

@@ -14,11 +14,10 @@ x-sharedDeployConfig: &sharedDeployConfig
           cpus: '0.1'
           memory: 10M
 
-version: "3.4"
-
 services:
   remote-api:
     <<: *sharedConfig
+    pull_policy: build
     build: .
     ports:
      - 8443:443

test/Dockerfile

@@ -1,12 +1,8 @@
+FROM docker:27.3.1-cli as docker
 FROM maven:3.6.3-openjdk-8-slim
 
-RUN curl https://download.docker.com/linux/static/stable/x86_64/docker-19.03.13.tgz | tar xvz --directory /tmp \
- && mv -v /tmp/docker/docker /usr/local/bin/docker \
- && chmod +x /usr/local/bin/docker \
- && rm -rf /tmp/docker
-
-RUN curl -L "https://github.com/docker/compose/releases/download/1.27.4/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose \
- && chmod +x /usr/local/bin/docker-compose
+COPY --from=docker --chmod=555 /usr/local/bin/docker /usr/local/bin/docker
+COPY --from=docker --chmod=555 /usr/local/libexec/docker/cli-plugins/ /root/.docker/cli-plugins
 
 WORKDIR /build
 COPY pom.xml .

test/docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3.4'
-
 services:
   remote-api:
     build: ..
@@ -12,6 +10,7 @@ services:
       - "/var/run/docker.sock:/var/run/docker.sock:ro"
 
   test:
+    pull_policy: build
     build: .
     volumes:
       - "/var/run/docker.sock:/var/run/docker.sock:ro"

test/pom.xml

@@ -31,7 +31,7 @@
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <version>2.7</version>
+      <version>2.14.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

test/src/test/java/de/kekru/dockerremoteapitls/test/BasicConnectionTest.java

@@ -57,7 +57,7 @@ public void failsOnNoTls() {
 
     // Then
     assertThat(exception)
-        .hasMessageContaining("error during connect: Get http://abc.127.0.0.1.nip.io:30129/v1.40/containers/json: EOF");
+        .hasMessageContaining("error during connect: Get \"http://abc.127.0.0.1.nip.io:30129/v1.47/containers/json\"");
   }
 
   @Test

test/src/test/java/de/kekru/dockerremoteapitls/test/utils/AbstractIntegrationTest.java

@@ -70,7 +70,7 @@ protected static String runDockerCompose(String composeCommand) {
     env.put("DOCKER_BUILDKIT", "1");
     env.put("COMPOSE_PROJECT_NAME", "test");
     //shellExecutor.execute("docker-compose build --progress=plain remote-api", env);
-    return shellExecutor.execute("docker-compose " + composeCommand, env);
+    return shellExecutor.execute("docker compose " + composeCommand, env);
   }
 
   protected static void waitForHealthy() {
@@ -85,7 +85,7 @@ protected static void waitForHealthy() {
 
         String output = runDockerCompose("ps remote-api");
 
-        if (output.contains("Up (healthy)")) {
+        if (output.contains("(healthy)")) {
           return;
         }
       }