Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use nightly build (rather than build it) #410

Merged
merged 1 commit into from
Dec 5, 2024
Merged

Use nightly build (rather than build it) #410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion base/config_files/docker_nightly_run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
9 changes: 9 additions & 0 deletions base/generate_tags.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"'/
Expand Down
2 changes: 1 addition & 1 deletion base/images/7.1-apache/config_files/docker_nightly_run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion base/images/7.1-fpm/config_files/docker_nightly_run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion base/images/7.2-apache/config_files/docker_nightly_run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion base/images/7.2-fpm/config_files/docker_nightly_run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion base/images/7.3-apache/config_files/docker_nightly_run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion base/images/7.3-fpm/config_files/docker_nightly_run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion base/images/7.4-apache/config_files/docker_nightly_run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion base/images/7.4-fpm/config_files/docker_nightly_run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion base/images/8.0-apache/config_files/docker_nightly_run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion base/images/8.0-fpm/config_files/docker_nightly_run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion base/images/8.1-apache/config_files/docker_nightly_run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion base/images/8.1-fpm/config_files/docker_nightly_run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion base/images/8.2-apache/config_files/docker_nightly_run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion base/images/8.2-fpm/config_files/docker_nightly_run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion base/images/8.3-apache/config_files/docker_nightly_run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion base/images/8.3-fpm/config_files/docker_nightly_run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion base/images/8.4-apache/config_files/docker_nightly_run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion base/images/8.4-fpm/config_files/docker_nightly_run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
18 changes: 14 additions & 4 deletions images/1.7.8.x/7.1-apache/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"]
18 changes: 14 additions & 4 deletions images/1.7.8.x/7.1-fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"]
18 changes: 14 additions & 4 deletions images/1.7.8.x/7.2-apache/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"]
18 changes: 14 additions & 4 deletions images/1.7.8.x/7.2-fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"]
18 changes: 14 additions & 4 deletions images/1.7.8.x/7.3-apache/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"]
18 changes: 14 additions & 4 deletions images/1.7.8.x/7.3-fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"]
18 changes: 14 additions & 4 deletions images/1.7.8.x/7.4-apache/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"]
18 changes: 14 additions & 4 deletions images/1.7.8.x/7.4-fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"]
Loading
Loading