From 5a855b17d71fb2bfe3952f48127025b02f00212f Mon Sep 17 00:00:00 2001 From: Adam JOLY Date: Sun, 5 Jan 2025 11:59:12 +0100 Subject: [PATCH] =?UTF-8?q?=E3=80=8C=F0=9F=8F=97=EF=B8=8F=E3=80=8D=20wip(M?= =?UTF-8?q?ariadb-entry):=20entrypoint=20building=20at=20build=20time?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 18 +++++++++++++++++ cmd/mariadb-entry/mariadb-entry.go | 7 ++++++- docker/mariadb/Dockerfile | 32 ++++++++++++++++++++---------- 3 files changed, 46 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index e69de29..376ac1b 100644 --- a/Makefile +++ b/Makefile @@ -0,0 +1,18 @@ +DB_SERVER_NAME := mariadb +WEB_SERVER_NAME := nginx +CMS_NAME := wordpress +DOCKER_FOLDER := docker + +DOCKER_CONTEXT := . +DOCKERFILE_DB := $(DOCKER_FOLDER)/$(DB_SERVER_NAME)/Dockerfile +DOCKERFILE_WEVSRV := $(DOCKER_FOLDER)/$(WEB_SERVER_NAME)/Dockerfile +DOCKERFILE_CMS := $(DOCKER_FOLDER)/$(CMS_NAME)/Dockerfile + +mariadb-build: + docker build -f $(DOCKERFILE_DB) -t $(DB_SERVER_NAME) . + +nginx-build: + docker build -f $(DOCKERFILE_WEVSRV) -t $(WEB_SERVER_NAME) . + +wp-build: + docker build -f $(DOCKERFILE_CMS) -t $(CMS_NAME) . diff --git a/cmd/mariadb-entry/mariadb-entry.go b/cmd/mariadb-entry/mariadb-entry.go index 0160a23..0019acb 100644 --- a/cmd/mariadb-entry/mariadb-entry.go +++ b/cmd/mariadb-entry/mariadb-entry.go @@ -1,9 +1,14 @@ package main import ( - + "fmt" + "os" ) func main() { + args := os.Args + for _, v := range args { + fmt.Println(v) + } } diff --git a/docker/mariadb/Dockerfile b/docker/mariadb/Dockerfile index 8ff12c2..3e2e413 100644 --- a/docker/mariadb/Dockerfile +++ b/docker/mariadb/Dockerfile @@ -3,23 +3,35 @@ FROM alpine:3.21 LABEL version="0.1" LABEL maintainer="KeyZox" -RUN groupadd --gid 999 -r mysql \ - && useradd -r -g mysql mysql --home-dir /var/lib/mysql --uid 999 \ +RUN addgroup mysql \ + && adduser -S -G mysql mysql -h /var/lib/mysql \ && echo 'permit nopass root as mysql' >> /etc/doas.conf -ENV LANG C.UTF-8 +RUN mkdir /build -COPY --chmod=0644 docker.cnf /etc/my.cnf.d/ +COPY go.mod /build/go.mod +COPY cmd /build/cmd -RUN set -x \ - && apk add --no-cache mariadb tzdata doas \ +RUN apk add --no-cache go \ + && cd /build \ + && go build git.keyzox.me/42_adjoly/inception/cmd/mariadb-entry \ + && cp /build/mariadb-entry /mariadb-entry \ + && apk del go \ + && rm -Rf /build + +ENV LANG=C.UTF-8 + +#COPY --chmod=0644 docker.cnf /etc/my.cnf.d/ + +RUN apk add --no-cache mariadb tzdata doas VOLUME /var/lib/mysql -COPY --chmod=0741 healthcheck.sh /healthcheck.sh -COPY --chmod=0741 docker-entrypoint.sh /docker-entrypoint.sh +#COPY --chmod=0741 healthcheck.sh /healthcheck.sh + +#ENTRYPOINT [ "/mariadb-entry" ] +WORKDIR /var/lib/mysql USER mysql EXPOSE 3306 -WORKDIR /var/lib/mysql -ENTRYPOINT [ "/docker-entrypoint" ] +CMD [ "mariadbd" ]