diff --git a/compose.yaml b/compose.yaml index e5e0ea2..98ec3b8 100644 --- a/compose.yaml +++ b/compose.yaml @@ -13,9 +13,10 @@ services: - FSETID - SETUID - # Prevents gaining new privileges devices: - /dev/kvm + + # Prevents gaining new privileges security_opt: - no-new-privileges @@ -25,11 +26,9 @@ services: nginx-site: container_name: "nginx-site" - restart: always - build: - context: ./nginx - dockerfile: Dockerfile + image: nginx + restart: always volumes: - ./nginx/nginx.conf:/etc/nginx/nginx.conf - ./certbot/conf:/etc/letsencrypt:ro @@ -51,7 +50,7 @@ services: - ./certbot/conf:/etc/letsencrypt:rw - ./certbot/www/:/var/www/certbot/:rw - command: certonly --webroot --webroot-path /var/www/certbot --force-renewal --email victorvobis@protonmail.com -d remoteserver.vps.webdock.cloud --agree-tos + command: certonly --webroot --webroot-path /var/www/certbot --force-renewal --email victorvobis@protonmail.com -d 127.0.0.1 --agree-tos website: container_name: "site" diff --git a/minishell/Dockerfile b/minishell/Dockerfile index f869763..844fe09 100644 --- a/minishell/Dockerfile +++ b/minishell/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:edge +FROM alpine ENV USERNAME="shelluser" \ PASSWORD="" \ SUDO_OK="false" \ @@ -6,7 +6,7 @@ ENV USERNAME="shelluser" \ TZ="Etc/UTC" COPY ./entrypoint.sh / -COPY --chmod=011 minishell_src/bin/minishell /bin/minishell +COPY --chmod=011 ./minishell_src/bin/minishell /bin/minishell RUN apk update && \ apk add --no-cache tini ttyd tzdata vim nano && \ diff --git a/minishell/minishell_src/bin/minishell b/minishell/minishell_src/bin/minishell index f832fbd..2f64a70 100755 Binary files a/minishell/minishell_src/bin/minishell and b/minishell/minishell_src/bin/minishell differ