Use nightly build (rather than buiild it)

PrestaShop · Dec 3, 2024 · b14cf7e · b14cf7e
1 parent 3fc902c
commit b14cf7e
Show file tree

Hide file tree

Showing 102 changed files with 676 additions and 1,412 deletions.
diff --git a/Dockerfile-branch.model b/Dockerfile-branch.model
@@ -1,10 +1,20 @@
 FROM prestashop/base:$container_version
 LABEL maintainer="PrestaShop Core Team <[email protected]>"
 
+ENV PS_VERSION $branch_version
+
+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=$branch_version
-ENV NODE_VERSION=$node_version
+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"]
diff --git a/base/Dockerfile.model b/base/Dockerfile.model
@@ -50,7 +50,7 @@ RUN docker-php-source extract \
     && docker-php-source delete
 
 # Prepare install and CMD script
-COPY config_files/ps-extractor.sh config_files/docker_run.sh config_files/docker_nightly_run.sh config_files/docker_branch_run.sh /tmp/
+COPY config_files/ps-extractor.sh config_files/docker_run.sh config_files/docker_nightly_run.sh /tmp/
 
 # If handle dynamic domain
 COPY config_files/docker_updt_ps_domains.php /tmp/

diff --git a/base/config_files/docker_branch_run.sh b/base/config_files/docker_branch_run.sh
diff --git a/base/config_files/docker_nightly_run.sh b/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/

diff --git a/base/images/7.1-apache/Dockerfile b/base/images/7.1-apache/Dockerfile
@@ -40,8 +40,7 @@ RUN apt-get update \
         libonig-dev
 
 RUN rm -rf /var/lib/apt/lists/*
-# PHP < 7.4 have an old syntax to install GD. See https://github.com/docker-library/php/issues/912
-RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include
+RUN docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ --with-webp=/usr/include
 RUN docker-php-ext-install iconv intl pdo_mysql mbstring soap gd zip bcmath
 
 RUN docker-php-source extract \
@@ -51,7 +50,7 @@ RUN docker-php-source extract \
     && docker-php-source delete
 
 # Prepare install and CMD script
-COPY config_files/ps-extractor.sh config_files/docker_run.sh config_files/docker_nightly_run.sh config_files/docker_branch_run.sh /tmp/
+COPY config_files/ps-extractor.sh config_files/docker_run.sh config_files/docker_nightly_run.sh /tmp/
 
 # If handle dynamic domain
 COPY config_files/docker_updt_ps_domains.php /tmp/

diff --git a/base/images/7.1-apache/config_files/docker_branch_run.sh b/base/images/7.1-apache/config_files/docker_branch_run.sh
diff --git a/base/images/7.1-apache/config_files/docker_nightly_run.sh b/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/

diff --git a/base/images/7.1-fpm/Dockerfile b/base/images/7.1-fpm/Dockerfile
@@ -40,8 +40,7 @@ RUN apt-get update \
         libonig-dev
 
 RUN rm -rf /var/lib/apt/lists/*
-# PHP < 7.4 have an old syntax to install GD. See https://github.com/docker-library/php/issues/912
-RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include
+RUN docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ --with-webp=/usr/include
 RUN docker-php-ext-install iconv intl pdo_mysql mbstring soap gd zip bcmath
 
 RUN docker-php-source extract \
@@ -51,7 +50,7 @@ RUN docker-php-source extract \
     && docker-php-source delete
 
 # Prepare install and CMD script
-COPY config_files/ps-extractor.sh config_files/docker_run.sh config_files/docker_nightly_run.sh config_files/docker_branch_run.sh /tmp/
+COPY config_files/ps-extractor.sh config_files/docker_run.sh config_files/docker_nightly_run.sh /tmp/
 
 # If handle dynamic domain
 COPY config_files/docker_updt_ps_domains.php /tmp/

diff --git a/base/images/7.1-fpm/config_files/docker_branch_run.sh b/base/images/7.1-fpm/config_files/docker_branch_run.sh
diff --git a/base/images/7.1-fpm/config_files/docker_nightly_run.sh b/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/

diff --git a/base/images/7.2-apache/Dockerfile b/base/images/7.2-apache/Dockerfile
@@ -40,8 +40,7 @@ RUN apt-get update \
         libonig-dev
 
 RUN rm -rf /var/lib/apt/lists/*
-# PHP < 7.4 have an old syntax to install GD. See https://github.com/docker-library/php/issues/912
-RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include
+RUN docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ --with-webp=/usr/include
 RUN docker-php-ext-install iconv intl pdo_mysql mbstring soap gd zip bcmath
 
 RUN docker-php-source extract \
@@ -51,7 +50,7 @@ RUN docker-php-source extract \
     && docker-php-source delete
 
 # Prepare install and CMD script
-COPY config_files/ps-extractor.sh config_files/docker_run.sh config_files/docker_nightly_run.sh config_files/docker_branch_run.sh /tmp/
+COPY config_files/ps-extractor.sh config_files/docker_run.sh config_files/docker_nightly_run.sh /tmp/
 
 # If handle dynamic domain
 COPY config_files/docker_updt_ps_domains.php /tmp/

diff --git a/base/images/7.2-apache/config_files/docker_branch_run.sh b/base/images/7.2-apache/config_files/docker_branch_run.sh
diff --git a/base/images/7.2-apache/config_files/docker_nightly_run.sh b/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/

diff --git a/base/images/7.2-fpm/Dockerfile b/base/images/7.2-fpm/Dockerfile
@@ -40,8 +40,7 @@ RUN apt-get update \
         libonig-dev
 
 RUN rm -rf /var/lib/apt/lists/*
-# PHP < 7.4 have an old syntax to install GD. See https://github.com/docker-library/php/issues/912
-RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include
+RUN docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ --with-webp=/usr/include
 RUN docker-php-ext-install iconv intl pdo_mysql mbstring soap gd zip bcmath
 
 RUN docker-php-source extract \
@@ -51,7 +50,7 @@ RUN docker-php-source extract \
     && docker-php-source delete
 
 # Prepare install and CMD script
-COPY config_files/ps-extractor.sh config_files/docker_run.sh config_files/docker_nightly_run.sh config_files/docker_branch_run.sh /tmp/
+COPY config_files/ps-extractor.sh config_files/docker_run.sh config_files/docker_nightly_run.sh /tmp/
 
 # If handle dynamic domain
 COPY config_files/docker_updt_ps_domains.php /tmp/