From 3eaef2ab70c3891609a56f9cf35121a6ae765304 Mon Sep 17 00:00:00 2001 From: FreedTapestry21 Date: Tue, 12 Nov 2024 12:15:32 +0100 Subject: [PATCH] Made the website into a docker container --- Dockerfile | 10 ++++++++++ docker-compose.yml | 7 +++++++ nginx/modules-enabled/daemon.conf | 1 + nginx/sites-enabled/default | 17 +++++++++++++++++ {assets => www/assets}/fonts/jbmono.woff2 | Bin {assets => www/assets}/js/index.js | 0 {assets => www/assets}/style.css | 0 index.html => www/index.html | 0 8 files changed, 35 insertions(+) create mode 100644 Dockerfile create mode 100644 docker-compose.yml create mode 100644 nginx/modules-enabled/daemon.conf create mode 100644 nginx/sites-enabled/default rename {assets => www/assets}/fonts/jbmono.woff2 (100%) rename {assets => www/assets}/js/index.js (100%) rename {assets => www/assets}/style.css (100%) rename index.html => www/index.html (100%) diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..b7eda14 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,10 @@ +FROM ubuntu:latest + +RUN apt update && apt install nginx python3 -y + +RUN rm -rf /etc/nginx/sites-enabled/default + +ADD nginx/ /etc/nginx/ +ADD www/ /var/html/www/ + +ENTRYPOINT ["nginx"] diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..38ef60e --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,7 @@ +services: + web: + build: . +# image: pixelated:testing + container_name: pixelated-web + ports: + - '80:80' diff --git a/nginx/modules-enabled/daemon.conf b/nginx/modules-enabled/daemon.conf new file mode 100644 index 0000000..ef1f9c1 --- /dev/null +++ b/nginx/modules-enabled/daemon.conf @@ -0,0 +1 @@ +daemon off; diff --git a/nginx/sites-enabled/default b/nginx/sites-enabled/default new file mode 100644 index 0000000..3687d20 --- /dev/null +++ b/nginx/sites-enabled/default @@ -0,0 +1,17 @@ +server { + listen 80 default_server; + listen [::]:80 default_server; + + server_name pixelated.example.com; + + root /var/html/www; + index index.html; + + location / { + if ($request_uri ~ ^/(.*)\.html) { + return 302 /$1; + } + try_files $uri $uri.html $uri/ =404; + } + +} diff --git a/assets/fonts/jbmono.woff2 b/www/assets/fonts/jbmono.woff2 similarity index 100% rename from assets/fonts/jbmono.woff2 rename to www/assets/fonts/jbmono.woff2 diff --git a/assets/js/index.js b/www/assets/js/index.js similarity index 100% rename from assets/js/index.js rename to www/assets/js/index.js diff --git a/assets/style.css b/www/assets/style.css similarity index 100% rename from assets/style.css rename to www/assets/style.css diff --git a/index.html b/www/index.html similarity index 100% rename from index.html rename to www/index.html