From 2cf69a09694fe6b48eab759a381854d711ee1ec6 Mon Sep 17 00:00:00 2001 From: Adam JOLY Date: Mon, 23 Dec 2024 14:51:37 +0100 Subject: [PATCH] =?UTF-8?q?=E3=80=8C=E2=9C=A8=E3=80=8D=20feat:=20TZ=20work?= =?UTF-8?q?ing?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- srcs/requirements/mariadb/Dockerfile | 10 +++++++--- srcs/requirements/nginx/Dockerfile | 10 ++++------ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/srcs/requirements/mariadb/Dockerfile b/srcs/requirements/mariadb/Dockerfile index 54736ac..66a209b 100644 --- a/srcs/requirements/mariadb/Dockerfile +++ b/srcs/requirements/mariadb/Dockerfile @@ -9,16 +9,20 @@ RUN groupadd --gid 999 -r mysql \ ENV LANG C.UTF-8 RUN set -x \ - && apk add --no-cache mariadb gosu \ + && apk add --no-cache mariadb gosu tzdata \ && gosu --version \ - && gosu nobody true + && gosu nobody true \ VOLUME /var/lib/mysql COPY healthcheck.sh /healthcheck.sh COPY docker-entrypoint.sh /docker-entrypoint.sh +RUN [ "chmod", "+x", "/docker-entrypoint.sh" ] +RUN [ "chmod", "+x", "/healthcheck.sh" ] -ENTRYPOINT [ "docker-entrypoint.sh" ] +ENTRYPOINT [ "/docker-entrypoint.sh" ] +WORKDIR /var/lib/mysql +USER mysql EXPOSE 3306 CMD [ "mariadbd" ] diff --git a/srcs/requirements/nginx/Dockerfile b/srcs/requirements/nginx/Dockerfile index 05d9f0d..3ea1bb6 100644 --- a/srcs/requirements/nginx/Dockerfile +++ b/srcs/requirements/nginx/Dockerfile @@ -6,16 +6,14 @@ LABEL maintainer="KeyZox" RUN set -x \ && addgroup -g 101 -S nginx\ && adduser -S -D -H -u 101 -h /var/cache/nginx -s /sbin/nologin -G nginx -g nginx nginx \ - && apk add --no-cache nginx \ + && apk add --no-cache nginx tzdata \ && ln -sf /dev/stdout /var/log/nginx/access.log \ - && ln -sf /dev/stderr /var/log/nginx/error.log \ - && apk add --no-cache tzdata + && ln -sf /dev/stderr /var/log/nginx/error.log -WORKDIR /etc/nginx VOLUME /etc/nginx -RUN mkdir -P /etc/nginx/sites-available +RUN mkdir -p /etc/nginx/sites-available -COPY docker-entrypoint.sh / +COPY docker-entrypoint.sh /docker-entrypoint.sh RUN [ "chmod", "+x", "/docker-entrypoint.sh" ] ENTRYPOINT [ "/docker-entrypoint.sh" ]