fix: safe apt install one-by-one

pifou25 · May 12, 2024 · f780b86 · f780b86
1 parent b64cd0b
commit f780b86
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 33 deletions.
diff --git a/.github/workflows/buildx-platform.yml b/.github/workflows/buildx-platform.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - 'master'
-      - 'develop'
+      - 'feature/safe_apt_install'
 
 # no concurrency, cancel previous running workflow
 concurrency:
@@ -42,7 +42,10 @@ jobs:
     # This step  build the same image on different runners / platforms
     runs-on: ubuntu-latest
     needs: initStep
+    # continue to next job even if some matrix steps fails
+    continue-on-error: true
     strategy:
+      # don't stop if any matrix combination fails
       fail-fast: false
       matrix:
         debian: [buster, bullseye, bookworm]
@@ -286,4 +289,4 @@ jobs:
         # inspect and add a minute sleep to avoid HTTP 429 error (too many requests...)
         run: |
           docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }}
-          sleep 1m
+          sleep 30s
diff --git a/build/Dockerfile b/build/Dockerfile
@@ -74,37 +74,41 @@ RUN echo '[ ! -z "$TERM" -a -r /etc/motd ] && cat /etc/issue && cat /etc/motd &&
 # common packages intall
 # alphabetical order for better compare
 RUN apt-get update && \
-  apt-get install --no-install-recommends --no-install-suggests -q -y tzdata software-properties-common && \
-  add-apt-repository non-free && \
-  apt-get update && \
-  apt-get install --no-install-recommends --no-install-suggests -q -y \
-  apt-transport-https \
-  apt-utils \
-  at \
-  bc \
-  ccze \
-  curl \
-  dos2unix \
-  ffmpeg \
-  gettext \
-  git \
-  iproute2 \
-  librsync-dev \
-  libssh2-1 \
-  libssh2-1-dev \
-  libzip-dev \
-  locales \
-  net-tools \
-  nmap \
-  ntp \
-  ntpdate \
-  mariadb-client \
-  python3 python3-dev python3-pip python3-virtualenv \
-  smbclient \
-  ssl-cert \
-  sudo \
-  wget \
-  zip unzip
+  apt-get install --no-install-recommends --no-install-suggests -q -y tzdata  && \
+  apt-get install --no-install-recommends --no-install-suggests -q -y software-properties-common
+RUN  add-apt-repository non-free && \
+  apt-get update
+RUN apt-get install --no-install-recommends --no-install-suggests -q -y apt-transport-https 
+RUN apt-get install --no-install-recommends --no-install-suggests -q -y apt-utils 
+RUN apt-get install --no-install-recommends --no-install-suggests -q -y at 
+RUN apt-get install --no-install-recommends --no-install-suggests -q -y bc 
+RUN apt-get install --no-install-recommends --no-install-suggests -q -y ccze 
+RUN apt-get install --no-install-recommends --no-install-suggests -q -y curl 
+RUN apt-get install --no-install-recommends --no-install-suggests -q -y dos2unix 
+RUN apt-get install --no-install-recommends --no-install-suggests -q -y ffmpeg 
+RUN apt-get install --no-install-recommends --no-install-suggests -q -y gettext 
+RUN apt-get install --no-install-recommends --no-install-suggests -q -y git 
+RUN apt-get install --no-install-recommends --no-install-suggests -q -y iproute2 
+RUN apt-get install --no-install-recommends --no-install-suggests -q -y librsync-dev 
+RUN apt-get install --no-install-recommends --no-install-suggests -q -y libssh2-1 
+RUN apt-get install --no-install-recommends --no-install-suggests -q -y libssh2-1-dev 
+RUN apt-get install --no-install-recommends --no-install-suggests -q -y libzip-dev 
+RUN apt-get install --no-install-recommends --no-install-suggests -q -y locales 
+RUN apt-get install --no-install-recommends --no-install-suggests -q -y net-tools 
+RUN apt-get install --no-install-recommends --no-install-suggests -q -y nmap 
+RUN apt-get install --no-install-recommends --no-install-suggests -q -y ntp 
+RUN apt-get install --no-install-recommends --no-install-suggests -q -y ntpdate 
+RUN apt-get install --no-install-recommends --no-install-suggests -q -y mariadb-client 
+RUN apt-get install --no-install-recommends --no-install-suggests -q -y python3
+RUN apt-get install --no-install-recommends --no-install-suggests -q -y python3-dev
+RUN apt-get install --no-install-recommends --no-install-suggests -q -y python3-pip 
+RUN apt-get install --no-install-recommends --no-install-suggests -q -y python3-virtualenv 
+RUN apt-get install --no-install-recommends --no-install-suggests -q -y smbclient 
+RUN apt-get install --no-install-recommends --no-install-suggests -q -y ssl-cert 
+RUN apt-get install --no-install-recommends --no-install-suggests -q -y sudo 
+RUN apt-get install --no-install-recommends --no-install-suggests -q -y wget 
+RUN apt-get install --no-install-recommends --no-install-suggests -q -y zip 
+RUN apt-get install --no-install-recommends --no-install-suggests -q -y unzip
 
 # add php extension
 # shellcheck disable=DL3022