Pull newer images during docker build (#3860)

wavesplatform · Jul 17, 2023 · ee95b92 · ee95b92
1 parent b773589
commit ee95b92
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/publish-docker-node.yaml b/.github/workflows/publish-docker-node.yaml
@@ -70,6 +70,7 @@ jobs:
         with:
           context: ./docker
           push: true
+          pull: true
           tags: ${{ steps.meta-public.outputs.tags }}
 
       - name: Build and push Docker private image
@@ -78,6 +79,7 @@ jobs:
         with:
           context: ./docker/private
           push: true
+          pull: true
           tags: ${{ steps.meta-private.outputs.tags }}
           build-args: |
             NODE_TAG=${{ steps.meta-public.outputs.version }}
diff --git a/.github/workflows/publish-node-sbt-builder.yml b/.github/workflows/publish-node-sbt-builder.yml
@@ -23,6 +23,7 @@ jobs:
           context: ./docker
           file: ./docker/node-sbt-builder.Dockerfile
           push: true
+          pull: true
           tags: wavesplatform/node-sbt-builder:${{ steps.extract-versions.outputs.waves-version }}
           build-args: |
             WAVES_VERSION=${{ steps.extract-versions.outputs.waves-version }}

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -1,10 +1,10 @@
-FROM eclipse-temurin:11-jre
+FROM eclipse-temurin:11-jre-jammy
 
 ENV WAVES_LOG_LEVEL=INFO
 ENV WAVES_HEAP_SIZE=2g
 ENV WAVES_NETWORK=mainnet
 
-ENV YOURKIT_VERSION=2022.9
+ENV YOURKIT_VERSION=2023.5
 
 SHELL ["/bin/bash", "-c"]
 

diff --git a/docker/build-node-sbt-builder.sh b/docker/build-node-sbt-builder.sh
@@ -5,5 +5,6 @@ WAVES_VERSION=$(cut -d\" -f2 ../version.sbt)
 docker build \
   --build-arg SBT_VERSION=$(cut -d= -f2 ../project/build.properties) \
   --build-arg WAVES_VERSION=$WAVES_VERSION \
+  --pull \
   -t wavesplatform/node-sbt-builder:$WAVES_VERSION \
   - < node-sbt-builder.Dockerfile
diff --git a/docker/node-sbt-builder.Dockerfile b/docker/node-sbt-builder.Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:8u345-b01-jdk-jammy
+FROM eclipse-temurin:8-jdk-jammy
 
 ARG WAVES_VERSION
 ARG SBT_VERSION