Skip to content

Commit

Permalink
Docker - Fix the dev image for building ZIP, do not use ; when the pr…
Browse files Browse the repository at this point in the history
…evious command must success
  • Loading branch information
Gustry committed Mar 4, 2025
1 parent 6fca3f9 commit cc5c901
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 8 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# expected variables in the CI environment
# - REGISTRY_URL = url of the docker registry
# Expected variables in the CI environment
# - REGISTRY_URL = URL of the Docker registry

STAGE=build

Expand Down
8 changes: 5 additions & 3 deletions dev/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,18 @@ ARG php_version
ARG DEBIAN_FRONTEND=noninteractive
ENV PHP_VERSION=${php_version}

RUN export DEBIAN_FRONTEND=noninteractive && apt-get install -y --no-install-recommends \
RUN export DEBIAN_FRONTEND=noninteractive \
&& apt-get update \
&& apt-get install -y --no-install-recommends \
make \
git \
zip \
; apt-get clean
&& apt-get clean

# Install nodejs and npm to build js files
RUN apt-get install -y ca-certificates curl gnupg \
&& mkdir -p /etc/apt/keyrings \
&& curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
&& 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 \
&& 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 \
&& apt-get update \
&& apt-get install nodejs -y
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG REGISTRY_PREFIX=''
FROM ${REGISTRY_PREFIX}alpine:3.17 as build
FROM ${REGISTRY_PREFIX}alpine:3.17 AS build

COPY lizmap_web_client.zip .
RUN unzip lizmap_web_client.zip
Expand Down
3 changes: 1 addition & 2 deletions docker/README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# Lizmap web client Docker image

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

(see [docker/php](https://hub.docker.com/_/php/))

## Configuration variables

Expand Down

0 comments on commit cc5c901

Please sign in to comment.