Skip to content

Commit 1247134

Browse files
committed
Update docker for 9.0.x branch
1 parent c325c20 commit 1247134

File tree

8 files changed

+16
-16
lines changed

8 files changed

+16
-16
lines changed

Dockerfile-branch.model

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ LABEL maintainer="PrestaShop Core Team <[email protected]>"
44
RUN apt update
55
RUN apt -y install git
66

7-
RUN git clone -b $branch_version https://github.com/PrestaShop/PrestaShop.git /tmp/data-ps
7+
ENV PS_BRANCH=$branch_version
88

9-
CMD ["/tmp/docker_run.sh"]
9+
CMD ["/tmp/docker_branch_run.sh"]

images/9.0.x/8.1-apache/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ LABEL maintainer="PrestaShop Core Team <[email protected]>"
44
RUN apt update
55
RUN apt -y install git
66

7-
RUN git clone -b 9.0.x https://github.com/PrestaShop/PrestaShop.git /tmp/data-ps
7+
ENV PS_BRANCH=9.0.x
88

9-
CMD ["/tmp/docker_run.sh"]
9+
CMD ["/tmp/docker_branch_run.sh"]

images/9.0.x/8.1-fpm/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ LABEL maintainer="PrestaShop Core Team <[email protected]>"
44
RUN apt update
55
RUN apt -y install git
66

7-
RUN git clone -b 9.0.x https://github.com/PrestaShop/PrestaShop.git /tmp/data-ps
7+
ENV PS_BRANCH=9.0.x
88

9-
CMD ["/tmp/docker_run.sh"]
9+
CMD ["/tmp/docker_branch_run.sh"]

images/9.0.x/8.2-apache/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ LABEL maintainer="PrestaShop Core Team <[email protected]>"
44
RUN apt update
55
RUN apt -y install git
66

7-
RUN git clone -b 9.0.x https://github.com/PrestaShop/PrestaShop.git /tmp/data-ps
7+
ENV PS_BRANCH=9.0.x
88

9-
CMD ["/tmp/docker_run.sh"]
9+
CMD ["/tmp/docker_branch_run.sh"]

images/9.0.x/8.2-fpm/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ LABEL maintainer="PrestaShop Core Team <[email protected]>"
44
RUN apt update
55
RUN apt -y install git
66

7-
RUN git clone -b 9.0.x https://github.com/PrestaShop/PrestaShop.git /tmp/data-ps
7+
ENV PS_BRANCH=9.0.x
88

9-
CMD ["/tmp/docker_run.sh"]
9+
CMD ["/tmp/docker_branch_run.sh"]

images/9.0.x/8.3-apache/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ LABEL maintainer="PrestaShop Core Team <[email protected]>"
44
RUN apt update
55
RUN apt -y install git
66

7-
RUN git clone -b 9.0.x https://github.com/PrestaShop/PrestaShop.git /tmp/data-ps
7+
ENV PS_BRANCH=9.0.x
88

9-
CMD ["/tmp/docker_run.sh"]
9+
CMD ["/tmp/docker_branch_run.sh"]

images/9.0.x/8.3-fpm/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ LABEL maintainer="PrestaShop Core Team <[email protected]>"
44
RUN apt update
55
RUN apt -y install git
66

7-
RUN git clone -b 9.0.x https://github.com/PrestaShop/PrestaShop.git /tmp/data-ps
7+
ENV PS_BRANCH=9.0.x
88

9-
CMD ["/tmp/docker_run.sh"]
9+
CMD ["/tmp/docker_branch_run.sh"]

tests/prestashop_docker/test_generator.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def setUp(self):
2929
contents='''
3030
CONTAINER_VERSION: $container_version
3131
RUN apt -y install git
32-
RUN git clone -b $branch_version https://github.com/PrestaShop/PrestaShop.git /tmp/data-ps
32+
ENV PS_BRANCH=$branch_version
3333
'''
3434
)
3535

@@ -156,7 +156,7 @@ def test_generate_branch_image(self):
156156
)
157157
self.assertIn('CONTAINER_VERSION: 8.1-alpine', content)
158158
self.assertIn('RUN apt -y install git', content)
159-
self.assertIn('RUN git clone -b 9.0.x https://github.com/PrestaShop/PrestaShop.git /tmp/data-ps', content)
159+
self.assertIn('ENV PS_BRANCH=9.0.x', content)
160160

161161
def test_generate_all(self):
162162
files = (

0 commit comments

Comments
 (0)