Fix Dockerfile.dask-staging-local

Author: jgaucher-cs

.github/workflows/publish-binaries.yml

@@ -292,13 +292,13 @@ jobs:
           name: ${{ needs.services-adgs-whl.outputs.package_name }}
           path: ./build_context_path
 
-      - name: Copy layer-cleanup.sh script
-        run: cp -t ./build_context_path ./.github/scripts/layer-cleanup.sh
+      - name: Copy Dockerfile requirements
+        run: cp -t ./build_context_path ./.github/scripts/layer-cleanup.sh ./.github/scripts/restore-apt.sh
         shell: bash
 
       - name: Copy debug mode dependencies
         if: ${{ needs.set-env.outputs.debug_mode }} == true
-        run: cp -t ./build_context_path ./.github/scripts/git_debug_image.sh ./.github/scripts/restore-apt.sh
+        run: cp -t ./build_context_path ./.github/scripts/git_debug_image.sh
         shell: bash
 
       - id: publish-docker
@@ -339,13 +339,13 @@ jobs:
           name: ${{ needs.services-prip-whl.outputs.package_name }}
           path: ./build_context_path
 
-      - name: Copy layer-cleanup.sh script
-        run: cp -t ./build_context_path ./.github/scripts/layer-cleanup.sh
+      - name: Copy Dockerfile requirements
+        run: cp -t ./build_context_path ./.github/scripts/layer-cleanup.sh ./.github/scripts/restore-apt.sh
         shell: bash
 
       - name: Copy debug mode dependencies
         if: ${{ needs.set-env.outputs.debug_mode }} == true
-        run: cp -t ./build_context_path ./.github/scripts/git_debug_image.sh ./.github/scripts/restore-apt.sh
+        run: cp -t ./build_context_path ./.github/scripts/git_debug_image.sh
         shell: bash
 
       - id: publish-docker
@@ -386,13 +386,13 @@ jobs:
           name: ${{ needs.services-cadip-whl.outputs.package_name }}
           path: ./build_context_path
 
-      - name: Copy layer-cleanup.sh script
-        run: cp -t ./build_context_path ./.github/scripts/layer-cleanup.sh
+      - name: Copy Dockerfile requirements
+        run: cp -t ./build_context_path ./.github/scripts/layer-cleanup.sh ./.github/scripts/restore-apt.sh
         shell: bash
 
       - name: Copy debug mode dependencies
         if: ${{ needs.set-env.outputs.debug_mode }} == true
-        run: cp -t ./build_context_path ./.github/scripts/git_debug_image.sh ./.github/scripts/restore-apt.sh
+        run: cp -t ./build_context_path ./.github/scripts/git_debug_image.sh
         shell: bash
 
       - id: publish-docker
@@ -432,13 +432,13 @@ jobs:
           name: ${{ needs.services-catalog-whl.outputs.package_name }}
           path: ./build_context_path
 
-      - name: Copy layer-cleanup.sh script
-        run: cp -t ./build_context_path ./.github/scripts/layer-cleanup.sh
+      - name: Copy Dockerfile requirements
+        run: cp -t ./build_context_path ./.github/scripts/layer-cleanup.sh ./.github/scripts/restore-apt.sh
         shell: bash
 
       - name: Copy debug mode dependencies
         if: ${{ needs.set-env.outputs.debug_mode }} == true
-        run: cp -t ./build_context_path ./.github/scripts/git_debug_image.sh ./.github/scripts/restore-apt.sh
+        run: cp -t ./build_context_path ./.github/scripts/git_debug_image.sh
         shell: bash
 
       - id: publish-docker
@@ -478,13 +478,13 @@ jobs:
         run: cp ./services/frontend/.github/entrypoint_frontend.sh ./build_context_path
         shell: bash
 
-      - name: Copy layer-cleanup.sh script
-        run: cp -t ./build_context_path ./.github/scripts/layer-cleanup.sh
+      - name: Copy Dockerfile requirements
+        run: cp -t ./build_context_path ./.github/scripts/layer-cleanup.sh ./.github/scripts/restore-apt.sh
         shell: bash
 
       - name: Copy debug mode dependencies
         if: ${{ needs.set-env.outputs.debug_mode }} == true
-        run: cp -t ./build_context_path ./.github/scripts/git_debug_image.sh ./.github/scripts/restore-apt.sh
+        run: cp -t ./build_context_path ./.github/scripts/git_debug_image.sh
         shell: bash
 
       - id: publish-docker
@@ -525,13 +525,13 @@ jobs:
           name: ${{ needs.services-staging-whl.outputs.package_name }}
           path: ./build_context_path
 
-      - name: Copy layer-cleanup.sh script
-        run: cp -t ./build_context_path ./.github/scripts/layer-cleanup.sh
+      - name: Copy Dockerfile requirements
+        run: cp -t ./build_context_path ./.github/scripts/layer-cleanup.sh ./.github/scripts/restore-apt.sh
         shell: bash
 
       - name: Copy debug mode dependencies
         if: ${{ needs.set-env.outputs.debug_mode }} == true
-        run: cp -t ./build_context_path ./.github/scripts/git_debug_image.sh ./.github/scripts/restore-apt.sh
+        run: cp -t ./build_context_path ./.github/scripts/git_debug_image.sh
         shell: bash
 
       - id: publish-docker
@@ -572,8 +572,8 @@ jobs:
           name: ${{ needs.services-staging-whl.outputs.package_name }}
           path: ./build_context_path
 
-      - name: Copy layer-cleanup.sh script
-        run: cp -t ./build_context_path ./.github/scripts/layer-cleanup.sh
+      - name: Copy Dockerfile requirements
+        run: cp -t ./build_context_path ./.github/scripts/layer-cleanup.sh ./.github/scripts/restore-apt.sh
         shell: bash
 
       - id: publish-docker

services/staging/.github/Dockerfile.dask-staging-local

@@ -22,10 +22,10 @@ ARG USER=dask:dask
 # Install dependencies for compilation
 USER root
 
-COPY ./layer-cleanup.sh /usr/local/bin/
-RUN chmod 755 /usr/local/bin/layer-cleanup.sh
+COPY ./layer-cleanup.sh ./restore-apt.sh /usr/local/bin/
+RUN chmod 755 /usr/local/bin/layer-cleanup.sh /usr/local/bin/restore-apt.sh
 
-RUN apt update && apt upgrade -y && apt install -y libpq-dev gcc git && layer-cleanup.sh
+RUN restore-apt.sh && apt update && apt upgrade -y && apt install -y libpq-dev gcc git && layer-cleanup.sh
 USER $USER
 
 # The CI builds the wheel packages, downloads them into ./whl/, then builds this Dockerfile from ./whl/,
@@ -53,7 +53,7 @@ USER root
 RUN apt autoremove -y gcc git && layer-cleanup.sh
 
 # Install dependencies necessary for execution not compilation
-RUN apt install -y libexpat1 && layer-cleanup.sh
+RUN restore-apt.sh && apt install -y libexpat1 && layer-cleanup.sh
 
 USER $USER