From 991fdc788e661d66be05360ff5c9b30fb3726c35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Jochum?= Date: Sun, 4 Sep 2022 04:05:12 +0200 Subject: [PATCH] Switch to caddy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: René Jochum --- Dockerfile | 7 ++----- docker/nginx/default.conf | 8 -------- docker/nginx/nginx.conf | 30 ------------------------------ 3 files changed, 2 insertions(+), 43 deletions(-) delete mode 100644 docker/nginx/default.conf delete mode 100644 docker/nginx/nginx.conf diff --git a/Dockerfile b/Dockerfile index a5b6150..4a16979 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,11 +8,8 @@ WORKDIR /build RUN hugo -b https://rene.jochum.dev -v -t persona # Copy to a nginx container -FROM nginx:alpine +FROM caddy:2.5.2-alpine LABEL maintainer="René Jochum " -COPY docker/nginx/nginx.conf /etc/nginx/ -COPY docker/nginx/default.conf /etc/nginx/conf.d/ - -COPY --from=0 /build/public /var/www/rene.jochum.dev +COPY --from=0 /build/public/ /usr/share/caddy/ diff --git a/docker/nginx/default.conf b/docker/nginx/default.conf deleted file mode 100644 index 245334e..0000000 --- a/docker/nginx/default.conf +++ /dev/null @@ -1,8 +0,0 @@ -server { - listen 80 default_server; - - error_log /dev/stderr; - access_log /dev/stdout; - - root /var/www/rene.jochum.dev; -} \ No newline at end of file diff --git a/docker/nginx/nginx.conf b/docker/nginx/nginx.conf deleted file mode 100644 index 40d2a34..0000000 --- a/docker/nginx/nginx.conf +++ /dev/null @@ -1,30 +0,0 @@ -user nginx; -worker_processes 4; -pid /run/nginx.pid; - -events { - worker_connections 2048; - multi_accept on; - use epoll; -} - -http { - server_tokens off; - sendfile on; - tcp_nopush on; - tcp_nodelay on; - keepalive_timeout 15; - types_hash_max_size 2048; - include /etc/nginx/mime.types; - default_type application/octet-stream; - access_log off; - error_log off; - gzip off; - gzip_disable "msie6"; - include /etc/nginx/conf.d/*.conf; - include /etc/nginx/sites-enabled/*; - open_file_cache max=100; - client_body_temp_path /tmp 1 2; - client_body_buffer_size 256k; - client_body_in_file_only off; -} \ No newline at end of file