From e29f30410596e689e630b7d0ca0b542432ad395b Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Tue, 13 Sep 2022 07:34:46 +0200
Subject: [PATCH] Finally deployed the nginx server again

---
 Dockerfile                 |  3 ---
 Makefile                   | 10 +++-------
 docker-compose.yml         | 12 ------------
 dockerhub/requirements.txt |  2 --
 requirements.txt           |  6 ++++--
 5 files changed, 7 insertions(+), 26 deletions(-)
 delete mode 100644 Dockerfile
 delete mode 100644 docker-compose.yml
 delete mode 100644 dockerhub/requirements.txt

diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index b65cae1..0000000
--- a/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM nginx:latest
-
-COPY ./site /usr/share/nginx/html
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 073023e..1f13489 100644
--- a/Makefile
+++ b/Makefile
@@ -6,19 +6,15 @@ all: build
 
 clean:
 	rm -rf ./site
-	docker container stop docs-server || true
-	docker container rm docs-server || true
 
 install-deps:
-	pip3 install -r ./dockerhub/requirements.txt
+	sudo pip3 install -r ./requirements.txt
 
 release: install-deps
-	python3 ./dockerhub/release.py
 
 build:
 	mkdocs build
-	docker compose build
+	sudo cp -r ./site/* /usr/share/nginx/html
 
 install: install-deps build
-	sudo certbot certonly --standalone --preferred-challenges http -d dbrepo-docs.ossdip.at --agree-tos --keep-until-expiring
-	docker compose up -d
\ No newline at end of file
+	sudo certbot --nginx --preferred-challenges http -d dbrepo-docs.ossdip.at --agree-tos --keep-until-expiring
diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index d7d3171..0000000
--- a/docker-compose.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-version: "3.6"
-
-services:
-
-  docs-server:
-    build: .
-    container_name: dbrepo-docs-server
-    hostname: dbrepo-docs-server
-    volumes:
-      - /etc/letsencrypt/live/:/tmp:ro
-    ports:
-      - 80:80
\ No newline at end of file
diff --git a/dockerhub/requirements.txt b/dockerhub/requirements.txt
deleted file mode 100644
index 36f16be..0000000
--- a/dockerhub/requirements.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-requests>=2.27.0
-py-dotenv>=0.1
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index 3fe9ef3..f4f2b73 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,7 @@
 mkdocs==1.3.0
 mkdocs-material==8.2.9
 mkdocs-with-pdf==0.9.3
-pymdown-extensions>=9.5
-mike>=1.1.2
\ No newline at end of file
+mkdocs-material-extensions>=1.0.3
+mike>=1.1.2
+requests>=2.27.0
+py-dotenv>=0.1
\ No newline at end of file
-- 
GitLab