From 08344a95dcda2bb0fc7b3a8097ad786f85a2b499 Mon Sep 17 00:00:00 2001 From: adjoly Date: Sat, 23 Aug 2025 20:10:47 +0200 Subject: [PATCH] =?UTF-8?q?=E3=80=8C=F0=9F=8F=97=EF=B8=8F=E3=80=8D=20wip:?= =?UTF-8?q?=20working=20dockerfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 6 +++--- Makefile | 6 +++--- sample.toml | 5 +++++ 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9498013..d1715c0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.21 AS builder +FROM alpine:3.22 AS builder COPY ./ /build @@ -8,9 +8,9 @@ ENV TTY=true RUN apk add --no-cache bash clang make RUN cd /build \ - && PKGS=true make -j re + && CXXFLAGS="-std=c++98" PKGS=true make -j re -FROM alpine:3.21 +FROM alpine:3.22 RUN apk add --no-cache libstdc++ diff --git a/Makefile b/Makefile index 6e32193..8eba403 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ SRCS = $(shell find . -name '*.cpp') OBJS = $(addprefix $(OBJSDIR), $(SRCS:.cpp=.o)) -FLAGS = -Wall -Werror -Wextra -std=c++98 -MMD -MP -g #-fsanitize=address +# CXXFLAGS = -Wall -Werror -Wextra -std=c++98 -MMD -MP -g #-fsanitize=address RED = \033[0;31m GREEN = \033[0;32m @@ -48,12 +48,12 @@ endif all: $(NAME) $(NAME): $(OBJS) - @$(CC) $(FLAGS) -I$(INCLUDES) $(OBJS) -o $(NAME) + @$(CC) $(CXXFLAGS) -I$(INCLUDES) $(OBJS) -o $(NAME) @printf "$(YELLOW)「✨」 feat($(NAME)): program compiled\n" $(OBJSDIR)%.o: %.cpp @mkdir -p $(@D) - @$(CC) $(FLAGS) -I$(INCLUDES) -Ilib/tomlpp/includes -c $< -o $@ + @$(CC) $(CXXFLAGS) -I$(INCLUDES) -Ilib/tomlpp/includes -c $< -o $@ @printf "$(DELETE)$(GREEN)「🔨」 build($<): object compiled\n" clean: diff --git a/sample.toml b/sample.toml index fb041cf..2174dd7 100644 --- a/sample.toml +++ b/sample.toml @@ -8,3 +8,8 @@ upload_path = "/home/mmoussou/test" dirlist = true methods = { "GET", "POST", "DELETE" } cgi = { ".py"} + +[server.error_pages] +401 = "unauthorized.html" +402 = "uwu.html" +404 = "exemples/err_pages/not_found.html"