Fix build docker cache (#2046)

Author: goshander

.github/workflows/build_application_docker.yaml

@@ -50,21 +50,21 @@ jobs:
           echo "BUILD_VERSION=$BUILD_VERSION" >> "$GITHUB_ENV"
           echo "COMMIT_NAME=$COMMIT_NAME" >> "$GITHUB_ENV"
       - name: Log in to the Container registry
-        uses: docker/login-action@v3.0.0
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Extract tags for Docker
         id: meta
-        uses: docker/metadata-action@v5.0.0
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
             type=raw,value=${{ env.BUILD_VERSION }}
             ${{ contains(env.COMMIT_NAME, '[release]') && 'type=raw,value=latest' || '' }}
       - name: Build and push Docker image
-        uses: docker/build-push-action@v5.0.0
+        uses: docker/build-push-action@v6
         with:
           build-args: |
             app_version=${{ env.BUILD_VERSION }}

.github/workflows/e2e_build_application_docker.yaml

@@ -50,20 +50,20 @@ jobs:
           echo "BUILD_VERSION=$BUILD_VERSION" >> "$GITHUB_ENV"
           echo "COMMIT_NAME=$COMMIT_NAME" >> "$GITHUB_ENV"
       - name: Log in to the Container registry
-        uses: docker/login-action@v3.0.0
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Extract tags for Docker
         id: meta
-        uses: docker/metadata-action@v5.0.0
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
             type=raw,value=${{ env.BUILD_VERSION }}-e2e
       - name: Build and push Docker image
-        uses: docker/build-push-action@v5.0.0
+        uses: docker/build-push-action@v6
         with:
           build-args: |
             app_version=${{ env.BUILD_VERSION }}

Dockerfile

@@ -6,10 +6,9 @@ ARG NODE_MAJOR=20
 ENV DEBIAN_FRONTEND=noninteractive
 ENV NODE_EXTRA_CA_CERTS=/usr/local/share/ca-certificates/cert.pem
 
-RUN apt-get update && apt-get -y upgrade
+RUN apt-get update && apt-get -y upgrade && apt-get -y install ca-certificates curl gnupg
 
 # node
-RUN apt-get -y install ca-certificates curl gnupg
 RUN mkdir -p /etc/apt/keyrings
 RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
 
@@ -37,17 +36,15 @@ ARG NODE_MAJOR=20
 
 ENV DEBIAN_FRONTEND=noninteractive
 
-RUN apt-get update && apt-get -y upgrade
+RUN apt-get update && apt-get -y upgrade && apt-get -y install ca-certificates curl gnupg
 
 # node
-RUN apt-get -y install ca-certificates curl gnupg
 RUN mkdir -p /etc/apt/keyrings
 RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
 
 RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_${NODE_MAJOR}.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
 
-RUN apt-get update
-RUN apt-get -y install nginx supervisor nodejs
+RUN apt-get update && apt-get -y install nginx supervisor nodejs
 
 # remove unnecessary packages
 RUN apt-get -y purge curl gnupg gnupg2 && \

tests/Dockerfile

@@ -4,17 +4,15 @@ ARG NODE_MAJOR=20
 
 ENV DEBIAN_FRONTEND=noninteractive
 
-RUN apt-get update && apt-get -y upgrade
+RUN apt-get update && apt-get -y upgrade && apt-get -y install ca-certificates curl gnupg
 
 # node
-RUN apt-get -y install ca-certificates curl gnupg
 RUN mkdir -p /etc/apt/keyrings
 RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
 
 RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_${NODE_MAJOR}.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
 
-RUN apt-get update
-RUN apt-get -y install nodejs
+RUN apt-get update && apt-get -y install nodejs
 
 # remove unnecessary packages
 RUN apt-get -y purge curl gnupg gnupg2 && \
@@ -55,8 +53,7 @@ COPY package.json package-lock.json /opt/app/
 COPY --from=install-stage /opt/app/node_modules /opt/app/node_modules
 
 # split install playwright deps and browser
-RUN npx playwright install chromium ffmpeg --with-deps --dry-run | grep --color=never 'sh -c' | sed 's|sh -c "||' | sed 's|"||' > ./deps.sh
-RUN chmod +x ./deps.sh && ./deps.sh && rm -rf ./deps.sh
+RUN npx playwright install chromium ffmpeg --with-deps --dry-run | grep --color=never 'sh -c' | sed 's|sh -c "||' | sed 's|"||' > ./deps.sh && chmod +x ./deps.sh && ./deps.sh && rm -rf ./deps.sh
 
 ENV PLAYWRIGHT_DOWNLOAD_HOST=https://storage.yandexcloud.net/playwright
 ENV PLAYWRIGHT_BROWSERS_PATH=/opt/app/pw-browsers