Use nightly build (rather than buiild it)

Dockerfile-branch.model

@@ -7,4 +7,4 @@ RUN apt -y install git
 ENV PS_BRANCH=$branch_version
 ENV NODE_VERSION=$node_version
 
-CMD ["/tmp/docker_branch_run.sh"]
+CMD ["/tmp/docker_branch_run.sh"]

base/config_files/docker_nightly_run.sh

@@ -2,7 +2,7 @@
 
 # Download nightly build
 if [ ! -d /tmp/data-ps ]; then
-    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E 'develop.+\.zip$$' | tail -1` /tmp/prestashop.zip
+    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E '$PS_VERSION.+\.zip$' | tail -1` /tmp/prestashop.zip
 
     mkdir -p /tmp/data-ps
     unzip -q /tmp/prestashop.zip -d /tmp/data-ps/

base/generate_tags.sh

@@ -41,6 +41,15 @@ generate_image()
             s/{PHP_TAG}/'"${version}"'/
         ' Dockerfile.model > images/$folder/Dockerfile
 
+    if [[ $version = *"7.1"* || $version = *"7.2"* || $version = *"7.3"* || $version = *"7.4"* ]]; then
+        local before='RUN docker-php-ext-configure gd --with-freetype=\/usr\/include\/ --with-jpeg=\/usr\/include\/ --with-webp=\/usr\/include'
+        local after='# PHP < 7.4 have an old syntax to install GD. See https:\/\/github.com\/docker-library\/php\/issues\/912\nRUN docker-php-ext-configure gd --with-freetype-dir=\/usr\/include\/ --with-jpeg-dir=\/usr\/include\/ --with-webp-dir=\/usr\/include'
+
+        sed -i '
+            s/'"${before}"'/'"${after}"'/
+        ' images/$folder/Dockerfile
+    fi
+
     cp -R config_files images/$folder/
     sed '
             s/{PHP_CMD}/'"${exec}"'/

base/images/7.1-apache/config_files/docker_nightly_run.sh

@@ -2,7 +2,7 @@
 
 # Download nightly build
 if [ ! -d /tmp/data-ps ]; then
-    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E 'develop.+\.zip$$' | tail -1` /tmp/prestashop.zip
+    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E '$PS_VERSION.+\.zip$' | tail -1` /tmp/prestashop.zip
 
     mkdir -p /tmp/data-ps
     unzip -q /tmp/prestashop.zip -d /tmp/data-ps/

base/images/7.1-fpm/config_files/docker_nightly_run.sh

@@ -2,7 +2,7 @@
 
 # Download nightly build
 if [ ! -d /tmp/data-ps ]; then
-    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E 'develop.+\.zip$$' | tail -1` /tmp/prestashop.zip
+    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E '$PS_VERSION.+\.zip$' | tail -1` /tmp/prestashop.zip
 
     mkdir -p /tmp/data-ps
     unzip -q /tmp/prestashop.zip -d /tmp/data-ps/

base/images/7.2-apache/config_files/docker_nightly_run.sh

@@ -2,7 +2,7 @@
 
 # Download nightly build
 if [ ! -d /tmp/data-ps ]; then
-    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E 'develop.+\.zip$$' | tail -1` /tmp/prestashop.zip
+    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E '$PS_VERSION.+\.zip$' | tail -1` /tmp/prestashop.zip
 
     mkdir -p /tmp/data-ps
     unzip -q /tmp/prestashop.zip -d /tmp/data-ps/

base/images/7.2-fpm/config_files/docker_nightly_run.sh

@@ -2,7 +2,7 @@
 
 # Download nightly build
 if [ ! -d /tmp/data-ps ]; then
-    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E 'develop.+\.zip$$' | tail -1` /tmp/prestashop.zip
+    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E '$PS_VERSION.+\.zip$' | tail -1` /tmp/prestashop.zip
 
     mkdir -p /tmp/data-ps
     unzip -q /tmp/prestashop.zip -d /tmp/data-ps/

base/images/7.3-apache/config_files/docker_nightly_run.sh

@@ -2,7 +2,7 @@
 
 # Download nightly build
 if [ ! -d /tmp/data-ps ]; then
-    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E 'develop.+\.zip$$' | tail -1` /tmp/prestashop.zip
+    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E '$PS_VERSION.+\.zip$' | tail -1` /tmp/prestashop.zip
 
     mkdir -p /tmp/data-ps
     unzip -q /tmp/prestashop.zip -d /tmp/data-ps/

base/images/7.3-fpm/config_files/docker_nightly_run.sh

@@ -2,7 +2,7 @@
 
 # Download nightly build
 if [ ! -d /tmp/data-ps ]; then
-    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E 'develop.+\.zip$$' | tail -1` /tmp/prestashop.zip
+    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E '$PS_VERSION.+\.zip$' | tail -1` /tmp/prestashop.zip
 
     mkdir -p /tmp/data-ps
     unzip -q /tmp/prestashop.zip -d /tmp/data-ps/

base/images/7.4-apache/config_files/docker_nightly_run.sh

@@ -2,7 +2,7 @@
 
 # Download nightly build
 if [ ! -d /tmp/data-ps ]; then
-    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E 'develop.+\.zip$$' | tail -1` /tmp/prestashop.zip
+    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E '$PS_VERSION.+\.zip$' | tail -1` /tmp/prestashop.zip
 
     mkdir -p /tmp/data-ps
     unzip -q /tmp/prestashop.zip -d /tmp/data-ps/

base/images/7.4-fpm/config_files/docker_nightly_run.sh

@@ -2,7 +2,7 @@
 
 # Download nightly build
 if [ ! -d /tmp/data-ps ]; then
-    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E 'develop.+\.zip$$' | tail -1` /tmp/prestashop.zip
+    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E '$PS_VERSION.+\.zip$' | tail -1` /tmp/prestashop.zip
 
     mkdir -p /tmp/data-ps
     unzip -q /tmp/prestashop.zip -d /tmp/data-ps/

base/images/8.0-apache/config_files/docker_nightly_run.sh

@@ -2,7 +2,7 @@
 
 # Download nightly build
 if [ ! -d /tmp/data-ps ]; then
-    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E 'develop.+\.zip$$' | tail -1` /tmp/prestashop.zip
+    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E '$PS_VERSION.+\.zip$' | tail -1` /tmp/prestashop.zip
 
     mkdir -p /tmp/data-ps
     unzip -q /tmp/prestashop.zip -d /tmp/data-ps/

base/images/8.0-fpm/config_files/docker_nightly_run.sh

@@ -2,7 +2,7 @@
 
 # Download nightly build
 if [ ! -d /tmp/data-ps ]; then
-    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E 'develop.+\.zip$$' | tail -1` /tmp/prestashop.zip
+    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E '$PS_VERSION.+\.zip$' | tail -1` /tmp/prestashop.zip
 
     mkdir -p /tmp/data-ps
     unzip -q /tmp/prestashop.zip -d /tmp/data-ps/

base/images/8.1-apache/config_files/docker_nightly_run.sh

@@ -2,7 +2,7 @@
 
 # Download nightly build
 if [ ! -d /tmp/data-ps ]; then
-    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E 'develop.+\.zip$$' | tail -1` /tmp/prestashop.zip
+    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E '$PS_VERSION.+\.zip$' | tail -1` /tmp/prestashop.zip
 
     mkdir -p /tmp/data-ps
     unzip -q /tmp/prestashop.zip -d /tmp/data-ps/

base/images/8.1-fpm/config_files/docker_nightly_run.sh

@@ -2,7 +2,7 @@
 
 # Download nightly build
 if [ ! -d /tmp/data-ps ]; then
-    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E 'develop.+\.zip$$' | tail -1` /tmp/prestashop.zip
+    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E '$PS_VERSION.+\.zip$' | tail -1` /tmp/prestashop.zip
 
     mkdir -p /tmp/data-ps
     unzip -q /tmp/prestashop.zip -d /tmp/data-ps/

base/images/8.2-apache/config_files/docker_nightly_run.sh

@@ -2,7 +2,7 @@
 
 # Download nightly build
 if [ ! -d /tmp/data-ps ]; then
-    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E 'develop.+\.zip$$' | tail -1` /tmp/prestashop.zip
+    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E '$PS_VERSION.+\.zip$' | tail -1` /tmp/prestashop.zip
 
     mkdir -p /tmp/data-ps
     unzip -q /tmp/prestashop.zip -d /tmp/data-ps/

base/images/8.2-fpm/config_files/docker_nightly_run.sh

@@ -2,7 +2,7 @@
 
 # Download nightly build
 if [ ! -d /tmp/data-ps ]; then
-    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E 'develop.+\.zip$$' | tail -1` /tmp/prestashop.zip
+    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E '$PS_VERSION.+\.zip$' | tail -1` /tmp/prestashop.zip
 
     mkdir -p /tmp/data-ps
     unzip -q /tmp/prestashop.zip -d /tmp/data-ps/

base/images/8.3-apache/config_files/docker_nightly_run.sh

@@ -2,7 +2,7 @@
 
 # Download nightly build
 if [ ! -d /tmp/data-ps ]; then
-    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E 'develop.+\.zip$$' | tail -1` /tmp/prestashop.zip
+    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E '$PS_VERSION.+\.zip$' | tail -1` /tmp/prestashop.zip
 
     mkdir -p /tmp/data-ps
     unzip -q /tmp/prestashop.zip -d /tmp/data-ps/

base/images/8.3-fpm/config_files/docker_nightly_run.sh

@@ -2,7 +2,7 @@
 
 # Download nightly build
 if [ ! -d /tmp/data-ps ]; then
-    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E 'develop.+\.zip$$' | tail -1` /tmp/prestashop.zip
+    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E '$PS_VERSION.+\.zip$' | tail -1` /tmp/prestashop.zip
 
     mkdir -p /tmp/data-ps
     unzip -q /tmp/prestashop.zip -d /tmp/data-ps/

base/images/8.4-apache/config_files/docker_nightly_run.sh

@@ -2,7 +2,7 @@
 
 # Download nightly build
 if [ ! -d /tmp/data-ps ]; then
-    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E 'develop.+\.zip$$' | tail -1` /tmp/prestashop.zip
+    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E '$PS_VERSION.+\.zip$' | tail -1` /tmp/prestashop.zip
 
     mkdir -p /tmp/data-ps
     unzip -q /tmp/prestashop.zip -d /tmp/data-ps/

base/images/8.4-fpm/config_files/docker_nightly_run.sh

@@ -2,7 +2,7 @@
 
 # Download nightly build
 if [ ! -d /tmp/data-ps ]; then
-    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E 'develop.+\.zip$$' | tail -1` /tmp/prestashop.zip
+    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E '$PS_VERSION.+\.zip$' | tail -1` /tmp/prestashop.zip
 
     mkdir -p /tmp/data-ps
     unzip -q /tmp/prestashop.zip -d /tmp/data-ps/

images/1.7.8.x/7.1-apache/Dockerfile

@@ -1,10 +1,20 @@
 FROM prestashop/base:7.1-apache
 LABEL maintainer="PrestaShop Core Team <[email protected]>"
 
+ENV PS_VERSION 1.7.8.x
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
 RUN apt update
-RUN apt -y install git
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
 
-ENV PS_BRANCH=1.7.8.x
-ENV NODE_VERSION=v14.20.0
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
 
-CMD ["/tmp/docker_branch_run.sh"]
+CMD ["/tmp/docker_nightly_run.sh"]

images/1.7.8.x/7.1-fpm/Dockerfile

@@ -1,10 +1,20 @@
 FROM prestashop/base:7.1-fpm
 LABEL maintainer="PrestaShop Core Team <[email protected]>"
 
+ENV PS_VERSION 1.7.8.x
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
 RUN apt update
-RUN apt -y install git
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
 
-ENV PS_BRANCH=1.7.8.x
-ENV NODE_VERSION=v14.20.0
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
 
-CMD ["/tmp/docker_branch_run.sh"]
+CMD ["/tmp/docker_nightly_run.sh"]

images/1.7.8.x/7.2-apache/Dockerfile

@@ -1,10 +1,20 @@
 FROM prestashop/base:7.2-apache
 LABEL maintainer="PrestaShop Core Team <[email protected]>"
 
+ENV PS_VERSION 1.7.8.x
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
 RUN apt update
-RUN apt -y install git
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
 
-ENV PS_BRANCH=1.7.8.x
-ENV NODE_VERSION=v14.20.0
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
 
-CMD ["/tmp/docker_branch_run.sh"]
+CMD ["/tmp/docker_nightly_run.sh"]

images/1.7.8.x/7.2-fpm/Dockerfile

@@ -1,10 +1,20 @@
 FROM prestashop/base:7.2-fpm
 LABEL maintainer="PrestaShop Core Team <[email protected]>"
 
+ENV PS_VERSION 1.7.8.x
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
 RUN apt update
-RUN apt -y install git
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
 
-ENV PS_BRANCH=1.7.8.x
-ENV NODE_VERSION=v14.20.0
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
 
-CMD ["/tmp/docker_branch_run.sh"]
+CMD ["/tmp/docker_nightly_run.sh"]

images/1.7.8.x/7.3-apache/Dockerfile

@@ -1,10 +1,20 @@
 FROM prestashop/base:7.3-apache
 LABEL maintainer="PrestaShop Core Team <[email protected]>"
 
+ENV PS_VERSION 1.7.8.x
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
 RUN apt update
-RUN apt -y install git
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
 
-ENV PS_BRANCH=1.7.8.x
-ENV NODE_VERSION=v14.20.0
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
 
-CMD ["/tmp/docker_branch_run.sh"]
+CMD ["/tmp/docker_nightly_run.sh"]

images/1.7.8.x/7.3-fpm/Dockerfile

@@ -1,10 +1,20 @@
 FROM prestashop/base:7.3-fpm
 LABEL maintainer="PrestaShop Core Team <[email protected]>"
 
+ENV PS_VERSION 1.7.8.x
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
 RUN apt update
-RUN apt -y install git
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
 
-ENV PS_BRANCH=1.7.8.x
-ENV NODE_VERSION=v14.20.0
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
 
-CMD ["/tmp/docker_branch_run.sh"]
+CMD ["/tmp/docker_nightly_run.sh"]

images/1.7.8.x/7.4-apache/Dockerfile

@@ -1,10 +1,20 @@
 FROM prestashop/base:7.4-apache
 LABEL maintainer="PrestaShop Core Team <[email protected]>"
 
+ENV PS_VERSION 1.7.8.x
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
 RUN apt update
-RUN apt -y install git
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
 
-ENV PS_BRANCH=1.7.8.x
-ENV NODE_VERSION=v14.20.0
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
 
-CMD ["/tmp/docker_branch_run.sh"]
+CMD ["/tmp/docker_nightly_run.sh"]

images/1.7.8.x/7.4-fpm/Dockerfile

@@ -1,10 +1,20 @@
 FROM prestashop/base:7.4-fpm
 LABEL maintainer="PrestaShop Core Team <[email protected]>"
 
+ENV PS_VERSION 1.7.8.x
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
 RUN apt update
-RUN apt -y install git
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
 
-ENV PS_BRANCH=1.7.8.x
-ENV NODE_VERSION=v14.20.0
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
 
-CMD ["/tmp/docker_branch_run.sh"]
+CMD ["/tmp/docker_nightly_run.sh"]