Skip to content

Commit

Permalink
Remove some deprecated statements from Dockerfile (3liz#4692)
Browse files Browse the repository at this point in the history
* Remove some deprecated statements from Dockerfile

* Update docker/Dockerfile
  • Loading branch information
Gustry authored Aug 19, 2024
1 parent 91a793b commit 2aeea3a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ FROM ${REGISTRY_PREFIX}alpine:3.17 as build
COPY lizmap_web_client.zip .
RUN unzip lizmap_web_client.zip

FROM ${REGISTRY_PREFIX}alpine:3.17
MAINTAINER David Marteau <[email protected]>
FROM alpine:3.17
LABEL org.opencontainers.image.authors="David Marteau <[email protected]>"
LABEL Description="Lizmap web client" Vendor="3liz.org" Version="23.02.0"

RUN apk update && apk upgrade && \
Expand Down Expand Up @@ -64,7 +64,7 @@ COPY php-fpm-healthcheck /usr/local/bin/

RUN chmod 755 /bin/lizmap-entrypoint.sh /bin/update-config.php /usr/local/bin/php-fpm-healthcheck

ENV PHP_INI_DIR /etc/php81
ENV PHP_INI_DIR=/etc/php81

HEALTHCHECK --interval=60s --timeout=30s CMD php-fpm-healthcheck || exit 1

Expand Down
4 changes: 2 additions & 2 deletions tests/docker-conf/openldap/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
# from https://github.com/dinkel/docker-openldap
# -----------------
FROM debian:buster-slim
MAINTAINER 3liz
LABEL org.opencontainers.image.authors="3Liz"

# properly setup debian sources
ENV DEBIAN_FRONTEND noninteractive
ENV DEBIAN_FRONTEND=noninteractive

RUN apt-get -y update && apt-get install -y --no-install-recommends \
slapd \
Expand Down

0 comments on commit 2aeea3a

Please sign in to comment.