From 5e57f7929437fa908c2a4d25595cbc2378ea73b5 Mon Sep 17 00:00:00 2001 From: Adam JOLY Date: Sun, 22 Dec 2024 18:56:32 +0100 Subject: [PATCH] =?UTF-8?q?=E3=80=8C=E2=9C=A8=E3=80=8D=20feat(Mariadb):=20?= =?UTF-8?q?Started=20dockerfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 ++ flake.nix | 9 +++++++ srcs/docker-compose.yml | 14 +++++++--- srcs/requirements/mariadb/Dockerfile | 20 ++++++++++++++ srcs/requirements/nginx/Dockerfile | 11 +++++--- srcs/requirements/nginx/docker-entrypoint.sh | 4 ++- srcs/requirements/wordpress/Dockerfile | 26 +++++++++++++++++++ .../wordpress/docker-entrypoint.sh | 3 +++ 8 files changed, 80 insertions(+), 9 deletions(-) create mode 100644 .gitignore create mode 100644 flake.nix create mode 100644 srcs/requirements/wordpress/docker-entrypoint.sh diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..61ae442 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +*/.env +.env diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..759c48a --- /dev/null +++ b/flake.nix @@ -0,0 +1,9 @@ +{ + inputs = { + + }; + + outputs = { + + }; +} diff --git a/srcs/docker-compose.yml b/srcs/docker-compose.yml index c7f5a08..f11a271 100644 --- a/srcs/docker-compose.yml +++ b/srcs/docker-compose.yml @@ -1,8 +1,9 @@ version: "3" +name: inception volumes: - db: - wordpress: + wp-db: + wp-site: networks: inception: @@ -19,7 +20,9 @@ services: - wordpress-php - db volumes: - - wordpress + - wp-site:/var/www/html + ports: + - "443:443" restart: unless-stopped wordpress-php: @@ -28,6 +31,8 @@ services: - inception environment: - TZ=Europe/Paris + volumes: + - wp-site:/var/www/html depends_on: - db restart: unless-stopped @@ -38,5 +43,6 @@ services: - inception environment: - TZ=Europe/Paris + volumes: + - wp-db:/var/lib/mysql restart: unless-stopped - diff --git a/srcs/requirements/mariadb/Dockerfile b/srcs/requirements/mariadb/Dockerfile index e69de29..43b314f 100644 --- a/srcs/requirements/mariadb/Dockerfile +++ b/srcs/requirements/mariadb/Dockerfile @@ -0,0 +1,20 @@ +FROM alpine:3.21 + +LABEL version="0.1" +LABEL maintainer="KeyZox" + +RUN groupadd -r mysql \ + && useradd -r -g mysql mysql --home-dir /var/lib/mysql + +RUN set -x \ + && + +VOLUME /var/lib/mysql + +COPY healthcheck.sh /healthcheck.sh +COPY docker-entrypoints.sh /docker-entrypoints.sh + +ENTRYPOINT ["docker-entrypoint.sh"] + +EXPOSE 3306 +CMD [ "mariadbd" ] diff --git a/srcs/requirements/nginx/Dockerfile b/srcs/requirements/nginx/Dockerfile index 5f07ffa..05d9f0d 100644 --- a/srcs/requirements/nginx/Dockerfile +++ b/srcs/requirements/nginx/Dockerfile @@ -4,20 +4,23 @@ LABEL version="0.1" LABEL maintainer="KeyZox" RUN set -x \ - && apk update \ && 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 nginx \ + && apk add --no-cache nginx \ && ln -sf /dev/stdout /var/log/nginx/access.log \ && ln -sf /dev/stderr /var/log/nginx/error.log \ && apk add --no-cache tzdata -STOPSIGNAL SIGQUIT +WORKDIR /etc/nginx +VOLUME /etc/nginx +RUN mkdir -P /etc/nginx/sites-available COPY docker-entrypoint.sh / +RUN [ "chmod", "+x", "/docker-entrypoint.sh" ] ENTRYPOINT [ "/docker-entrypoint.sh" ] +WORKDIR /etc/nginx +STOPSIGNAL SIGQUIT EXPOSE 80 - CMD [ "nginx", "-g", "daemon off;" ] diff --git a/srcs/requirements/nginx/docker-entrypoint.sh b/srcs/requirements/nginx/docker-entrypoint.sh index 06a5806..214eb4c 100644 --- a/srcs/requirements/nginx/docker-entrypoint.sh +++ b/srcs/requirements/nginx/docker-entrypoint.sh @@ -1 +1,3 @@ -echo WTF +#!/bin/sh + +exec "$@" diff --git a/srcs/requirements/wordpress/Dockerfile b/srcs/requirements/wordpress/Dockerfile index e69de29..57b7e85 100644 --- a/srcs/requirements/wordpress/Dockerfile +++ b/srcs/requirements/wordpress/Dockerfile @@ -0,0 +1,26 @@ +FROM alpine:3.21 + +LABEL version="0.1" +LABEL maintainer="KeyZox" + +RUN set -eux; \ + adduser -u 82 -D -S -G www-data www-data + +RUN set -x \ + && apk add --no-cache php84-fpm wget + +VOLUME /var/www/html + +WORKDIR /var/www/html +RUN wget https://wordpress.org/wordpress-6.7.1.tar.gz + && tar -xzvf wordpress-6.7.1.zip + +COPY docker-entrypoint.sh / +RUN [ "chmod", "+x", "/docker-entrypoint.sh" ] + +ENTRYPOINT [ "/docker-entrypoint.sh" ] +WORKDIR /var/www/html +STOPSIGNAL SIGQUIT + +EXPOSE 9000 +CMD [ "php-fpm84", "-F" ] diff --git a/srcs/requirements/wordpress/docker-entrypoint.sh b/srcs/requirements/wordpress/docker-entrypoint.sh new file mode 100644 index 0000000..214eb4c --- /dev/null +++ b/srcs/requirements/wordpress/docker-entrypoint.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +exec "$@"