Skip to content

Commit cc5c901

Browse files
committed
Docker - Fix the dev image for building ZIP, do not use ; when the previous command must success
1 parent 6fca3f9 commit cc5c901

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
2-
# expected variables in the CI environment
3-
# - REGISTRY_URL = url of the docker registry
2+
# Expected variables in the CI environment
3+
# - REGISTRY_URL = URL of the Docker registry
44

55
STAGE=build
66

dev/Dockerfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,18 @@ ARG php_version
66
ARG DEBIAN_FRONTEND=noninteractive
77
ENV PHP_VERSION=${php_version}
88

9-
RUN export DEBIAN_FRONTEND=noninteractive && apt-get install -y --no-install-recommends \
9+
RUN export DEBIAN_FRONTEND=noninteractive \
10+
&& apt-get update \
11+
&& apt-get install -y --no-install-recommends \
1012
make \
1113
git \
1214
zip \
13-
; apt-get clean
15+
&& apt-get clean
1416

1517
# Install nodejs and npm to build js files
1618
RUN apt-get install -y ca-certificates curl gnupg \
1719
&& mkdir -p /etc/apt/keyrings \
1820
&& curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
19-
&& echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
21+
&& echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_21.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
2022
&& apt-get update \
2123
&& apt-get install nodejs -y

docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG REGISTRY_PREFIX=''
2-
FROM ${REGISTRY_PREFIX}alpine:3.17 as build
2+
FROM ${REGISTRY_PREFIX}alpine:3.17 AS build
33

44
COPY lizmap_web_client.zip .
55
RUN unzip lizmap_web_client.zip

docker/README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
# Lizmap web client Docker image
22

33
The container deploys one Lizmap instance and may run php-fpm on the command line.
4-
(see [docker/php](https://hub.docker.com/_/php/) )
5-
4+
(see [docker/php](https://hub.docker.com/_/php/))
65

76
## Configuration variables
87

0 commit comments

Comments
 (0)