From 2aeea3a4926693394f32e09785880cecc84c07a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89tienne=20Trimaille?= Date: Mon, 19 Aug 2024 15:57:35 +0200 Subject: [PATCH] Remove some deprecated statements from Dockerfile (#4692) * Remove some deprecated statements from Dockerfile * Update docker/Dockerfile --- docker/Dockerfile | 6 +++--- tests/docker-conf/openldap/Dockerfile | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index c69b88a590..33556a546e 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -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 +FROM alpine:3.17 +LABEL org.opencontainers.image.authors="David Marteau " LABEL Description="Lizmap web client" Vendor="3liz.org" Version="23.02.0" RUN apk update && apk upgrade && \ @@ -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 diff --git a/tests/docker-conf/openldap/Dockerfile b/tests/docker-conf/openldap/Dockerfile index 92afefd65f..391164daa5 100644 --- a/tests/docker-conf/openldap/Dockerfile +++ b/tests/docker-conf/openldap/Dockerfile @@ -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 \