diff --git a/Makefile b/Makefile index 659c270..382e110 100644 --- a/Makefile +++ b/Makefile @@ -3,31 +3,34 @@ 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 +DOCKER_CONTEXT := srcs/ +DOCKERFILE_DB := $(DOCKER_CONTEXT)$(DOCKER_FOLDER)/$(DB_SERVER_NAME)/Dockerfile +DOCKERFILE_WEVSRV := $(DOCKER_CONTEXT)$(DOCKER_FOLDER)/$(WEB_SERVER_NAME)/Dockerfile +DOCKERFILE_CMS := $(DOCKER_CONTEXT)$(DOCKER_FOLDER)/$(CMS_NAME)/Dockerfile build-db: - docker build -f $(DOCKERFILE_DB) -t $(DB_SERVER_NAME) . + docker build -f $(DOCKERFILE_DB) -t $(DB_SERVER_NAME) $(DOCKER_CONTEXT) build-websrv: - docker build -f $(DOCKERFILE_WEVSRV) -t $(WEB_SERVER_NAME) . + docker build -f $(DOCKERFILE_WEVSRV) -t $(WEB_SERVER_NAME) $(DOCKER_CONTEXT) build-cms: - docker build -f $(DOCKERFILE_CMS) -t $(CMS_NAME) . + docker build -f $(DOCKERFILE_CMS) -t $(CMS_NAME) $(DOCKER_CONTEXT) start-db: - docker compose up db --build + docker compose -f $(DOCKER_CONTEXT)/docker-compose.yml up db --build start-nginx: - docker compose up nginx --build + docker compose -f $(DOCKER_CONTEXT)/docker-compose.yml up nginx --build +start-wordp: + docker compose -f $(DOCKER_CONTEXT)/docker-compose.yml up wordpress-php --build clean-db: docker stop inception-db docker container rm inception-db docker volume rm inception_wp-db + docker image rm inception-db clean-nginx: docker stop inception-nginx diff --git a/docker/wordpress/Dockerfile b/docker/wordpress/Dockerfile deleted file mode 100644 index 57b7e85..0000000 --- a/docker/wordpress/Dockerfile +++ /dev/null @@ -1,26 +0,0 @@ -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/cmd/mariadb/entrypoint/entrypoint.go b/srcs/cmd/mariadb/entrypoint/entrypoint.go similarity index 100% rename from cmd/mariadb/entrypoint/entrypoint.go rename to srcs/cmd/mariadb/entrypoint/entrypoint.go diff --git a/cmd/mariadb/healthcheck/healthcheck.go b/srcs/cmd/mariadb/healthcheck/healthcheck.go similarity index 100% rename from cmd/mariadb/healthcheck/healthcheck.go rename to srcs/cmd/mariadb/healthcheck/healthcheck.go diff --git a/cmd/wordpress/wordpress-entry.go b/srcs/cmd/wordpress/wordpress-entry.go similarity index 100% rename from cmd/wordpress/wordpress-entry.go rename to srcs/cmd/wordpress/wordpress-entry.go diff --git a/configs/mariadb/docker.cnf b/srcs/configs/mariadb/docker.cnf similarity index 100% rename from configs/mariadb/docker.cnf rename to srcs/configs/mariadb/docker.cnf diff --git a/configs/nginx/wp.conf b/srcs/configs/nginx/wp.conf similarity index 100% rename from configs/nginx/wp.conf rename to srcs/configs/nginx/wp.conf diff --git a/docker-compose.yml b/srcs/docker-compose.yml similarity index 96% rename from docker-compose.yml rename to srcs/docker-compose.yml index fe3a8a8..fd8e41d 100644 --- a/docker-compose.yml +++ b/srcs/docker-compose.yml @@ -28,7 +28,7 @@ services: restart: unless-stopped wordpress-php: - container_name: inception-workp-php + container_name: inception-wordp-php build: context: . dockerfile: docker/wordpress/dockerfile diff --git a/srcs/docker/alpine/alpine-minirootfs-3.21.2-x86_64.tar.gz b/srcs/docker/alpine/alpine-minirootfs-3.21.2-x86_64.tar.gz new file mode 100644 index 0000000..ec01aee Binary files /dev/null and b/srcs/docker/alpine/alpine-minirootfs-3.21.2-x86_64.tar.gz differ diff --git a/docker/mariadb/Dockerfile b/srcs/docker/mariadb/Dockerfile similarity index 94% rename from docker/mariadb/Dockerfile rename to srcs/docker/mariadb/Dockerfile index f562064..b2e5ce4 100644 --- a/docker/mariadb/Dockerfile +++ b/srcs/docker/mariadb/Dockerfile @@ -1,4 +1,5 @@ -FROM alpine:3.21 +FROM scratch +ADD docker/alpine/alpine-minirootfs-3.21.2-x86_64.tar.gz / LABEL version="0.1" LABEL maintainer="KeyZox" diff --git a/docker/nginx/Dockerfile b/srcs/docker/nginx/Dockerfile similarity index 100% rename from docker/nginx/Dockerfile rename to srcs/docker/nginx/Dockerfile diff --git a/docker/nginx/docker-healthcheck.sh b/srcs/docker/nginx/docker-healthcheck.sh similarity index 100% rename from docker/nginx/docker-healthcheck.sh rename to srcs/docker/nginx/docker-healthcheck.sh diff --git a/docker/nginx/nginx-health.conf b/srcs/docker/nginx/nginx-health.conf similarity index 100% rename from docker/nginx/nginx-health.conf rename to srcs/docker/nginx/nginx-health.conf diff --git a/srcs/docker/wordpress/Dockerfile b/srcs/docker/wordpress/Dockerfile new file mode 100644 index 0000000..c28cdef --- /dev/null +++ b/srcs/docker/wordpress/Dockerfile @@ -0,0 +1,25 @@ +FROM alpine:3.21 + +LABEL version="0.1" +LABEL maintainer="KeyZox" + +RUN set -x \ + && adduser -u 82 -D -S -G www-data www-data \ + && 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.tar.gz \ + && rm workpress-6.7.1.tar.gz + +#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/go.mod b/srcs/go.mod similarity index 100% rename from go.mod rename to srcs/go.mod diff --git a/internal/env/env_util.go b/srcs/internal/env/env_util.go similarity index 100% rename from internal/env/env_util.go rename to srcs/internal/env/env_util.go diff --git a/internal/log/log.go b/srcs/internal/log/log.go similarity index 100% rename from internal/log/log.go rename to srcs/internal/log/log.go