42_adjoly/inception
1
0
Fork 0
Code

「✨」 feat: Should be working

Browse Source
This commit is contained in:
Adam JOLY
2025-01-17 16:49:53 +01:00
parent 89e5921175
commit 9a8f33f0b4
15 changed files with 272 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@ -8,6 +8,9 @@ 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
all:
docker compose -f $(DOCKER_CONTEXT)docker-compose.yml up -d --build
build-db:
docker build -f $(DOCKERFILE_DB) -t $(DB_SERVER_NAME) $(DOCKER_CONTEXT)
@ -26,6 +29,15 @@ start-nginx:
start-wordp:
docker compose -f $(DOCKER_CONTEXT)docker-compose.yml up wordpress-php --build
stop:
docker compose -f $(DOCKER_CONTEXT)docker-compose.yml stop
clean: stop
docker system prune
fclean: clean
docker system prune -a
clean-db:
docker stop inception-db
docker container rm inception-db
@ -43,4 +55,6 @@ clean-nginx:
docker container rm inception-nginx
docker image rm inception-nginx
re: clean all
.PHONY: cms-build db-build websrv-build clean-db clean-nginx

175
srcs/cmd/nginx/entrypoint/entrypoint.go Normal file
View File

@ -0,0 +1,175 @@
package main
import (
"bytes"
"fmt"
"log"
"os"
"os/exec"
"path/filepath"
"regexp"
"strings"
"git.keyzox.me/42_adjoly/inception/internal/env"
"git.keyzox.me/42_adjoly/inception/internal/log"
"golang.org/x/sys/unix"
)
func addStreamConf(confFile, stream_output_dir string) {
confBlock := "stream {\n include +" + stream_output_dir + "/*.conf;\n}"
reg, err := regexp.Compile("\\s*stream\\s*\\{")
if err != nil {
log.Fatal(err)
}
content, err := os.ReadFile(confFile)
if err != nil {
log.Fatal(err)
}
if reg.MatchString(string(content)) == true {
_log.Log("note", "Stream block already present in "+confFile)
return
}
file, err := os.OpenFile(confFile, os.O_APPEND|os.O_WRONLY, 0)
if err != nil {
log.Fatal(err)
}
defer file.Close()
file.WriteString(confBlock)
_log.Log("note", "Added stream block in config")
}
func streamTemplate(template_dir, stream_suffix string) {
stream_output_dir := env.EnvCheck("NGINX_ENVSUBST_STREAM_OUTPUT_DIR", "/etc/nginx/stream-conf.d")
os.Mkdir(stream_output_dir, 0755)
if unix.Access(stream_output_dir, unix.W_OK) != nil {
_log.Log("error", "Stream template output directory not writable "+stream_output_dir)
}
dir, err := os.ReadDir(template_dir)
if err != nil {
_log.Log("error", "Error reading "+template_dir+" folder")
}
addStreamConf("/etc/nginx/nginx.conf", stream_output_dir)
_log.Log("note", "Loading stream templates...")
for _, v := range dir {
reg, err := regexp.Compile(stream_suffix + "$")
if err != nil {
log.Fatal(err)
}
if reg.MatchString(v.Name()) == true {
if v.IsDir() == false {
path := filepath.Join(template_dir, v.Name())
content, err := os.ReadFile(path)
if err != nil {
_log.Log("warn", "Can't read file : "+v.Name())
continue
}
cmd := exec.Command("envsubst")
cmd.Stdin = bytes.NewReader(content)
finalFile, err := os.Create(strings.TrimSuffix(stream_output_dir+"/"+v.Name(), stream_suffix))
if err != nil {
log.Fatal(err)
}
cmd.Stdout = finalFile
}
}
}
_log.Log("note", "Stream template loaded !")
}
func subStTemplate() {
template_dir := env.EnvCheck("NGINX_ENVSUBST_TEMPLATE_DIR", "/etc/nginx/templates")
template_suffix := env.EnvCheck("NGINX_ENVSUBST_TEMPLATE_SUFFIX", ".template")
stream_suffix := env.EnvCheck("NGINX_ENVSUBST_STREAM_TEMPLATE_SUFFIX", ".stream-template")
output_dir := env.EnvCheck("NGINX_ENVSUBST_OUTPUT_DIR", "/etc/nginx/http.d")
unix.Access(template_dir, unix.W_OK)
unix.Access(output_dir, unix.W_OK)
dir, err := os.ReadDir(template_dir)
if err != nil {
_log.Log("error", "Error reading "+template_dir+" folder")
}
_log.Log("note", "Loading templates...")
for _, v := range dir {
reg, err := regexp.Compile(template_suffix + "$")
if err != nil {
log.Fatal(err)
}
if reg.MatchString(v.Name()) == true {
if v.IsDir() == false {
path := filepath.Join(template_dir, v.Name())
content, err := os.ReadFile(path)
if err != nil {
_log.Log("warn", "Can't read file : "+v.Name())
continue
}
cmd := exec.Command("envsubst")
cmd.Stdin = bytes.NewReader(content)
finalFile, err := os.Create(strings.TrimSuffix(output_dir+"/"+v.Name(), template_suffix))
if err != nil {
log.Fatal(err)
}
cmd.Stdout = finalFile
if err := cmd.Run(); err != nil {
log.Fatal(err)
}
}
}
}
_log.Log("note", "Template loaded !")
i := 0
reg, err := regexp.Compile(stream_suffix + "$")
for _, v := range dir {
if reg.MatchString(v.Name()) {
i++;
}
}
if i == 0 {
_log.Log("note", "No stream template found, skipping...")
return
}
streamTemplate(template_dir, stream_suffix)
}
func main() {
args := os.Args
if args[1] == "nginx" || args[1] == "nginx-debug" {
_log.Log("note", "Entrypoint script for NGINX Server started")
subStTemplate()
dir, err := os.ReadDir("/docker-entrypoint.d")
if err != nil {
log.Fatal(err)
}
_log.Log("note", "Running entrypoint scripts")
for _, v := range dir {
os.Chmod("/docker-entrypoint.d/" + v.Name(), 0755)
cmd := exec.Command("/docker-entrypoint.d/" + v.Name())
cmd.Env = os.Environ()
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
cmd.Stdin = os.Stdin
if err := cmd.Run(); err != nil {
fmt.Printf("Error running script(%s): %v\n", v.Name(), err)
os.Exit(1)
}
}
_log.Log("note", "Starting NGINX")
}
cmd := exec.Command(args[1], args[2:]...)
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
cmd.Stdin = os.Stdin
if err := cmd.Run(); err != nil {
fmt.Printf("Error running NGINX: %v\n", err)
os.Exit(1)
}
}

9
srcs/configs/nginx/entry/cert-gen.sh Executable file
View File

@ -0,0 +1,9 @@
#!/bin/sh
if [ ! -f ${NGINX_SSL_KEY_FILE} ]; then
echo "Generating certs"
mkdir -p /etc/nginx/ssl
openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout ${NGINX_SSL_KEY_FILE} -out ${NGINX_SSL_CERT_FILE} -subj "/C=FR/ST=IDF/L=Angouleme/O=42/OU=42/CN=adjoly.42.fr/UID=adjoly"
else
printf "Key already exist not recreating\n"
fi

19
srcs/configs/nginx/ff.conf
View File

@ -1,19 +0,0 @@
server {
listen 80;
server_name adjoly.42.fr;
root /var/www/html;
index index.php index.html index.htm;
location / {
try_files $uri $uri/ /index.php?$args;
}
location ~ \.php$ {
include fastcgi_params;
fastcgi_pass php-fpm:9000;
fastcgi_index index.php;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
}
}

26
srcs/configs/nginx/templates/www.conf.template Normal file
View File

@ -0,0 +1,26 @@
server {
listen 443 ssl;
server_name adjoly.42.fr www.adjoly.42.fr;
root /var/www/html/;
index index.php;
ssl_certificate $NGINX_SSL_CERT_FILE;
ssl_certificate_key $NGINX_SSL_KEY_FILE;
ssl_protocols TLSv1.2 TLSv1.3;
ssl_session_timeout 10m;
keepalive_timeout 60;
location / {
try_files $uri $uri/ =404;
}
location ~ \.php$ {
include fastcgi.conf;
fastcgi_pass $NGINX_PHP_HOST:9000;
fastcgi_index index.php;
fastcgi_split_path_info ^(.+\.php)(/.+)$;
}
}

19
srcs/docker-compose.yml
View File

@ -13,18 +13,26 @@ services:
container_name: inception-nginx
build:
context: .
dockerfile: docker/nginx/dockerfile
dockerfile: docker/nginx/Dockerfile
networks:
- inception
environment:
- TZ=Europe/Paris
- NGINX_PHP_HOST=inception-wordp-php
- NGINX_SSL_KEY_FILE=/etc/nginx/ssl/adjoly-wp.key
- NGINX_SSL_CERT_FILE=/etc/nginx/ssl/adjoly-wp.crt
depends_on:
- wordpress-php
- db
wordpress-php:
condition: service_started
db:
condition: service_started
volumes:
- wp-site:/var/www/html
- ./configs/nginx/templates:/etc/nginx/templates
- ./configs/nginx/entry:/docker-entrypoint.d
ports:
- "443:443"
- "8443:443"
- "8080:80"
restart: unless-stopped
wordpress-php:
@ -34,6 +42,9 @@ services:
dockerfile: docker/wordpress/Dockerfile
networks:
- inception
depends_on:
db:
condition: service_started
environment:
- PHP_MEMORY_LIMIT="512M"
- PHP_MAX_UPLOAD="50M"

2
srcs/docker/mariadb/Dockerfile
View File

@ -39,4 +39,4 @@ WORKDIR /var/lib/mysql
EXPOSE 3306
CMD [ "mariadbd", "--user=mysql" ]
HEALTHCHECK --interval=30s --timeout=10s --retries=3 CMD /docker-healthcheck
HEALTHCHECK --interval=30s --timeout=10s --retries=3 --start-period=1s --start-interval=2s CMD /docker-healthcheck

31
srcs/docker/nginx/Dockerfile
View File

@ -4,22 +4,37 @@ ADD docker/alpine/alpine-minirootfs-3.21.2-x86_64.tar.gz /
LABEL version="0.1"
LABEL maintainer="KeyZox"
COPY go.mod /build/go.mod
COPY cmd /build/cmd
COPY internal /build/internal
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 tzdata \
&& apk add --no-cache go nginx openssl tzdata envsubst curl \
&& cd /build \
&& go get git.keyzox.me/42_adjoly/inception/cmd/nginx/entrypoint \
&& go build git.keyzox.me/42_adjoly/inception/cmd/nginx/entrypoint \
&& cp /build/entrypoint /docker-entrypoint \
&& chmod +x /docker-entrypoint \
&& apk del go \
&& ln -sf /dev/stdout /var/log/nginx/access.log \
&& ln -sf /dev/stderr /var/log/nginx/error.log
&& ln -sf /dev/stderr /var/log/nginx/error.log \
&& rm -Rf /build \
&& rm -rf /var/cache/apk/* \
&& mkdir -p /var/www/html \
&& mkdir -p /etc/nginx/conf.d \
&& mkdir /docker-entrypoint.d
VOLUME /etc/nginx
RUN mkdir -p /etc/nginx/sites-available
COPY docker-healthcheck.sh /docker-healthcheck.sh
RUN chmod +x /docker-healthcheck.sh
VOLUME /etc/nginx/templates
VOLUME /docker-entrypoint.d
COPY docker/nginx/health.conf /etc/nginx/http.d/health.conf
ENTRYPOINT [ "/docker-entrypoint" ]
WORKDIR /etc/nginx
STOPSIGNAL SIGQUIT
EXPOSE 80
CMD [ "nginx", "-g", "daemon off;" ]
HEALTHCHECK --interval=30s --timeout=10s --retries=3 CMD /docker-healthcheck.sh
HEALTHCHECK --interval=30s --timeout=10s --retries=3 --start-period=1s --start-interval=2s CMD curl http://127.0.0.1:80/health || exit 1

3
srcs/docker/nginx/docker-healthcheck.sh
View File

@ -1,3 +0,0 @@
#!/bin/sh
curl -f http://localhost/health || exit 1

7
srcs/configs/nginx/wp.conf → srcs/docker/nginx/health.conf
View File

@ -1,10 +1,5 @@
server {
listen 80;
location / {
root /usr/share/nginx/html;
index index.html index.htm;
}
listen 127.0.0.1:80;
location /health {
access_log off;

33
srcs/docker/nginx/nginx-health.conf
View File

@ -1,33 +0,0 @@
user nginx;
worker_processes 1;
error_log /var/log/nginx/error.log warn;
pid /var/run/nginx/nginx.pid;
events {
worker_connections 1024;
}
http {
include /etc/nginx/mime.types;
default_type application/octet-stream;
sendfile on;
access_log /var/log/nginx/access.log;
keepalive_timeout 3000;
server {
listen 80;
root /www;
index index.php index.html index.htm;
server_name localhost;
client_max_body_size 32m;
error_page 500 502 503 504 /50x.html;
location = /50x.html {
root /var/lib/nginx/html;
}
location ~ \.php$ {
fastcgi_pass 127.0.0.1:9000;
fastcgi_index index.php;
include fastcgi.conf;
}
}
}

2
srcs/docker/wordpress/Dockerfile
View File

@ -46,4 +46,4 @@ STOPSIGNAL SIGQUIT
EXPOSE 9000
CMD [ "php-fpm84", "-F" ]
HEALTHCHECK --interval=30s --timeout=10s --retries=3 CMD cgi-fcgi -bind -connect 127.0.0.1:9000 || exit 1
HEALTHCHECK --interval=30s --timeout=10s --retries=3 --start-period=1s --start-interval=2s CMD cgi-fcgi -bind -connect 127.0.0.1:${PHP_PORT:-9000} || exit 1

3
srcs/go.mod
View File

@ -2,5 +2,4 @@ module git.keyzox.me/42_adjoly/inception
go 1.23.4
require (
)
require golang.org/x/sys v0.29.0 // indirect

2
srcs/go.sum Normal file
View File

@ -0,0 +1,2 @@
golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=

6
srcs/internal/env/env_util.go vendored
View File

@ -7,7 +7,8 @@ import (
"git.keyzox.me/42_adjoly/inception/internal/log"
)
func FileEnv(Value string, Default string) string {
// Check if the "Value" exist in the env if not check if a "Value_FILE" exist and if still not just return default value
func FileEnv(Value, Default string) string {
val, is := os.LookupEnv(Value)
if is {
@ -25,6 +26,7 @@ func FileEnv(Value string, Default string) string {
return Default
}
// Check if the "Value" exist in the env check if not just return default value
func EnvCheck(Value, Default string) string {
val, is := os.LookupEnv(Value)
@ -37,7 +39,7 @@ func EnvCheck(Value, Default string) string {
func EscapeEnv(str string) string {
if str[0] == '"' && str[len(str) - 1] == '"' {
return strings.TrimPrefix(strings.TrimSuffix(str, "\""), "\"")
} else if str[0] == '"' && str[len(str) - 1] == '"' {
} else if str[0] == '\'' && str[len(str) - 1] == '\'' {
return strings.TrimPrefix(strings.TrimSuffix(str, "'"), "'")
} else {
return str