Merge pull request #7 from filviu/wrong-shas

fix sha512 mixups and jre versions
filviu · Mar 4, 2024 · d388186 · d388186
2 parents 86135ac + 8b33e07
commit d388186
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 18 deletions.
diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
@@ -68,35 +68,35 @@
             - 5.18.3-alpine
       steps:
         - name: Check out
-          uses: actions/checkout@v3
+          uses: actions/checkout@v4
 
         - name: Set up Docker Buildx
           uses: docker/setup-buildx-action@v2
 
         - name: Cache Docker layers
-          uses: actions/cache@v3
+          uses: actions/cache@v4
           with:
             path: /tmp/.buildx-cache
             key: ${{ runner.os }}-buildx-${{ github.sha }}
             restore-keys: |
               ${{ runner.os }}-buildx-
   
         - name: Login to Dockerhub
-          uses: docker/login-action@v2
+          uses: docker/login-action@v3
           with:
             username: ${{ github.repository_owner }}
             password: ${{ secrets.DOCKERHUB_PASSWORD }}
 
         - name: Build image
-          uses: docker/build-push-action@v3
+          uses: docker/build-push-action@v5
           with:
             tags: filviu/activemq:${{ matrix.mq_version }}
             context: ./${{ matrix.mq_version }}
             platforms: linux/amd64
             push: false
             load: true 
-            cache-from: type=gha,scope=${{ matrix.mq_version }}
-            cache-to: type=gha,mode=max,scope=${{ matrix.mq_version }}
+            cache-from: type=gha,ignore-error=true,scope=${{ matrix.mq_version }}
+            cache-to: type=gha,mode=max,ignore-error=true,scope=${{ matrix.mq_version }}
 
         - name: Test the image
           shell: bash
@@ -108,12 +108,12 @@
   
         - name: Build & push image
           if: github.event_name == 'push'
-          uses: docker/build-push-action@v3
+          uses: docker/build-push-action@v5
           with:
             tags: filviu/activemq:${{ matrix.mq_version }}
             context: ./${{ matrix.mq_version }}
             platforms: linux/amd64
             push: true
-            cache-from: type=gha,scope=${{ matrix.mq_version }}
-            cache-to: type=gha,mode=max,scope=${{ matrix.mq_version }}
+            cache-from: type=gha,ignore-error=true,scope=${{ matrix.mq_version }}
+            cache-to: type=gha,mode=max,ignore-error=true,scope=${{ matrix.mq_version }}
 
diff --git a/5.16.7-alpine/Dockerfile b/5.16.7-alpine/Dockerfile
@@ -3,7 +3,7 @@ FROM amd64/eclipse-temurin:8-jre-alpine
 ENV ACTIVEMQ_VERSION 5.16.7
 ENV ACTIVEMQ apache-activemq-$ACTIVEMQ_VERSION
 ENV ACTIVEMQ_TCP=61616 ACTIVEMQ_AMQP=5672 ACTIVEMQ_STOMP=61613 ACTIVEMQ_MQTT=1883 ACTIVEMQ_WS=61614 ACTIVEMQ_UI=8161
-ENV SHA512_VAL=d14e773f8e426c2c7b870637584db57660ad66449052725bfd27542f7a8acc235e3fc28a54dbdbe162c68da2685c4f9d42433e1a155cab4caa7646dde061a3d3
+ENV SHA512_VAL=cc0ceeb32d4c2dc22883ed0ffe7ec5bb16fb99963c445cad24b4ea313e3e780510e81ffd5828ce7f5c4e5898b4eba1a7c3c77f0912c52accf2d0e517ba75bdb7
 
 ENV ACTIVEMQ_HOME /opt/activemq
 

diff --git a/5.16.7/Dockerfile b/5.16.7/Dockerfile
@@ -3,7 +3,7 @@ FROM amd64/eclipse-temurin:8-jre-jammy
 ENV ACTIVEMQ_VERSION 5.16.7
 ENV ACTIVEMQ apache-activemq-$ACTIVEMQ_VERSION
 ENV ACTIVEMQ_TCP=61616 ACTIVEMQ_AMQP=5672 ACTIVEMQ_STOMP=61613 ACTIVEMQ_MQTT=1883 ACTIVEMQ_WS=61614 ACTIVEMQ_UI=8161
-ENV SHA512_VAL=d14e773f8e426c2c7b870637584db57660ad66449052725bfd27542f7a8acc235e3fc28a54dbdbe162c68da2685c4f9d42433e1a155cab4caa7646dde061a3d3
+ENV SHA512_VAL=cc0ceeb32d4c2dc22883ed0ffe7ec5bb16fb99963c445cad24b4ea313e3e780510e81ffd5828ce7f5c4e5898b4eba1a7c3c77f0912c52accf2d0e517ba75bdb7
 
 ENV ACTIVEMQ_HOME /opt/activemq
 

diff --git a/5.17.3-alpine/Dockerfile b/5.17.3-alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM amd64/eclipse-temurin:8-jre-alpine
+FROM amd64/eclipse-temurin:11-jre-alpine
 
 ENV ACTIVEMQ_VERSION 5.16.5
 ENV ACTIVEMQ apache-activemq-$ACTIVEMQ_VERSION

diff --git a/5.17.6-alpine/Dockerfile b/5.17.6-alpine/Dockerfile
@@ -1,9 +1,9 @@
-FROM amd64/eclipse-temurin:8-jre-alpine
+FROM amd64/eclipse-temurin:11-jre-alpine
 
 ENV ACTIVEMQ_VERSION 5.17.6
 ENV ACTIVEMQ apache-activemq-$ACTIVEMQ_VERSION
 ENV ACTIVEMQ_TCP=61616 ACTIVEMQ_AMQP=5672 ACTIVEMQ_STOMP=61613 ACTIVEMQ_MQTT=1883 ACTIVEMQ_WS=61614 ACTIVEMQ_UI=8161
-ENV SHA512_VAL=d14e773f8e426c2c7b870637584db57660ad66449052725bfd27542f7a8acc235e3fc28a54dbdbe162c68da2685c4f9d42433e1a155cab4caa7646dde061a3d3
+ENV SHA512_VAL=c34a1179f8a14ab07299b219287b7cc0bbf4e89ac66139f31a12dd8d36c2e2308230a7f6cc8c3f6aa6147ac58b5c6b37c253a9797c5e1665786161f417e96842
 
 ENV ACTIVEMQ_HOME /opt/activemq
 

diff --git a/5.17.6/Dockerfile b/5.17.6/Dockerfile
@@ -3,7 +3,7 @@ FROM amd64/eclipse-temurin:11-jre-jammy
 ENV ACTIVEMQ_VERSION 5.17.6
 ENV ACTIVEMQ apache-activemq-$ACTIVEMQ_VERSION
 ENV ACTIVEMQ_TCP=61616 ACTIVEMQ_AMQP=5672 ACTIVEMQ_STOMP=61613 ACTIVEMQ_MQTT=1883 ACTIVEMQ_WS=61614 ACTIVEMQ_UI=8161
-ENV SHA512_VAL=8ed682fd8c9910f186cc14872552fcb1b5e8d361466b880c92dbd8a0f3a8fba339047023891e027ece7f57663a271fe47e73358e0290b371e78e5bfe70387468
+ENV SHA512_VAL=c34a1179f8a14ab07299b219287b7cc0bbf4e89ac66139f31a12dd8d36c2e2308230a7f6cc8c3f6aa6147ac58b5c6b37c253a9797c5e1665786161f417e96842
 
 ENV ACTIVEMQ_HOME /opt/activemq
 

diff --git a/5.18.3-alpine/Dockerfile b/5.18.3-alpine/Dockerfile
@@ -1,9 +1,9 @@
-FROM amd64/eclipse-temurin:8-jre-alpine
+FROM amd64/eclipse-temurin:11-jre-alpine
 
 ENV ACTIVEMQ_VERSION 5.18.3
 ENV ACTIVEMQ apache-activemq-$ACTIVEMQ_VERSION
 ENV ACTIVEMQ_TCP=61616 ACTIVEMQ_AMQP=5672 ACTIVEMQ_STOMP=61613 ACTIVEMQ_MQTT=1883 ACTIVEMQ_WS=61614 ACTIVEMQ_UI=8161
-ENV SHA512_VAL=d14e773f8e426c2c7b870637584db57660ad66449052725bfd27542f7a8acc235e3fc28a54dbdbe162c68da2685c4f9d42433e1a155cab4caa7646dde061a3d3
+ENV SHA512_VAL=61abc4a08b9e1db6a5b1062bb1c839171e93bcb571817fd81744dd19874d713840bba99c7979d45bcb832d13ea01986b76fb11720f5ec63a0283e7d1934a33cc
 
 ENV ACTIVEMQ_HOME /opt/activemq
 

diff --git a/5.18.3/Dockerfile b/5.18.3/Dockerfile
@@ -3,7 +3,7 @@ FROM amd64/eclipse-temurin:11-jre-jammy
 ENV ACTIVEMQ_VERSION 5.18.3
 ENV ACTIVEMQ apache-activemq-$ACTIVEMQ_VERSION
 ENV ACTIVEMQ_TCP=61616 ACTIVEMQ_AMQP=5672 ACTIVEMQ_STOMP=61613 ACTIVEMQ_MQTT=1883 ACTIVEMQ_WS=61614 ACTIVEMQ_UI=8161
-ENV SHA512_VAL=8ed682fd8c9910f186cc14872552fcb1b5e8d361466b880c92dbd8a0f3a8fba339047023891e027ece7f57663a271fe47e73358e0290b371e78e5bfe70387468
+ENV SHA512_VAL=61abc4a08b9e1db6a5b1062bb1c839171e93bcb571817fd81744dd19874d713840bba99c7979d45bcb832d13ea01986b76fb11720f5ec63a0283e7d1934a33cc
 
 ENV ACTIVEMQ_HOME /opt/activemq