Changes from tests in GitHub actions

Author: Quetzacoalt91

.github/workflows/publish.yml

@@ -42,7 +42,7 @@ jobs:
     needs: list_base_images
     strategy:
         matrix:
-            manifest: ${{ fromJson(needs.list_base_images.outputs.versions) }}
+            version: ${{ fromJson(needs.list_base_images.outputs.versions) }}
     steps:
       - name: Login to Docker Hub
         uses: docker/login-action@v2
@@ -60,13 +60,13 @@ jobs:
         working-directory: base
 
       - name: Base Images > Docker Build Tags
-        run: DOCKER_REPOSITORY=${{ vars.DOCKER_REPOSITORY}} ./docker_tags.sh --version ${{ matrix.version }}
+        run: DOCKER_REPOSITORY=${{ vars.DOCKER_BASE_REPOSITORY}} ./docker_tags.sh --version ${{ matrix.version }}
         if: ${{ github.event_name == 'pull_request' }}
         working-directory: base
 
       - name: Base Images > Docker Build & Force Push
         if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' && needs.list_base_images.outputs.base_has_changed == 'true' }}
-        run: DOCKER_REPOSITORY=${{ vars.DOCKER_REPOSITORY}} ./docker_tags.sh -p -f --version ${{ matrix.version }}
+        run: DOCKER_REPOSITORY=${{ vars.DOCKER_BASE_REPOSITORY}} ./docker_tags.sh -p -f --version ${{ matrix.version }}
         working-directory: base
 
 

base/docker_tags.sh

@@ -3,6 +3,7 @@
 : ${PLATFORM_ARGS:="linux/arm/v7,linux/arm64/v8,linux/amd64"}
 : ${DOCKER_REPOSITORY:="prestashop/base"}
 
+set -e 
 cd $(cd "$( dirname "$0" )" && pwd)
 
 # Default values

base/images/7.1-apache/Dockerfile

@@ -24,6 +24,10 @@ PS_HANDLE_DYNAMIC_DOMAIN=0 \
 PS_FOLDER_ADMIN=admin \
 PS_FOLDER_INSTALL=install
 
+RUN sed -ie "s/deb.debian.org/archive.debian.org/g" /etc/apt/sources.list \
+    && sed -ie "s/security.debian.org/archive.debian.org/g" /etc/apt/sources.list \
+    && echo 'Sources list updated'
+
 RUN apt-get update \
     && apt-get install -y libmcrypt-dev \
         libjpeg62-turbo-dev \

base/images/7.1-fpm/Dockerfile

@@ -24,6 +24,10 @@ PS_HANDLE_DYNAMIC_DOMAIN=0 \
 PS_FOLDER_ADMIN=admin \
 PS_FOLDER_INSTALL=install
 
+RUN sed -ie "s/deb.debian.org/archive.debian.org/g" /etc/apt/sources.list \
+    && sed -ie "s/security.debian.org/archive.debian.org/g" /etc/apt/sources.list \
+    && echo 'Sources list updated'
+
 RUN apt-get update \
     && apt-get install -y libmcrypt-dev \
         libjpeg62-turbo-dev \

base/images/7.2-apache/Dockerfile

@@ -24,6 +24,10 @@ PS_HANDLE_DYNAMIC_DOMAIN=0 \
 PS_FOLDER_ADMIN=admin \
 PS_FOLDER_INSTALL=install
 
+RUN sed -ie "s/deb.debian.org/archive.debian.org/g" /etc/apt/sources.list \
+    && sed -ie "s/security.debian.org/archive.debian.org/g" /etc/apt/sources.list \
+    && echo 'Sources list updated'
+
 RUN apt-get update \
     && apt-get install -y libmcrypt-dev \
         libjpeg62-turbo-dev \

base/images/7.2-fpm/Dockerfile

@@ -24,6 +24,10 @@ PS_HANDLE_DYNAMIC_DOMAIN=0 \
 PS_FOLDER_ADMIN=admin \
 PS_FOLDER_INSTALL=install
 
+RUN sed -ie "s/deb.debian.org/archive.debian.org/g" /etc/apt/sources.list \
+    && sed -ie "s/security.debian.org/archive.debian.org/g" /etc/apt/sources.list \
+    && echo 'Sources list updated'
+
 RUN apt-get update \
     && apt-get install -y libmcrypt-dev \
         libjpeg62-turbo-dev \

base/tags.txt

@@ -1,14 +1,10 @@
-7.1-apache
-7.2-apache
 7.3-apache
 7.4-apache
 8.0-apache
 8.1-apache
 8.2-apache
 8.3-apache
 8.4-apache
-7.1-fpm
-7.2-fpm
 7.3-fpm
 7.4-fpm
 8.0-fpm