From 0edb77b03dff0f40de6c5d07c7a957cad0613dcd Mon Sep 17 00:00:00 2001 From: SqrtMinusOne Date: Sat, 11 Dec 2021 19:08:46 +0300 Subject: [PATCH] feat: better deploy --- Dockerfile | 8 ++++++++ deployer.py => deploy/deployer.py | 0 deploy/entrypoint.sh | 5 +++++ docker-compose.yml | 9 +++++++++ repos/dotfiles | 2 +- 5 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 Dockerfile rename deployer.py => deploy/deployer.py (100%) create mode 100644 deploy/entrypoint.sh create mode 100644 docker-compose.yml diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..afcb174 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,8 @@ +FROM nginx:1.21.4 +RUN apt-get update && apt-get install -y python3 python3-pip git +RUN pip install flask python-dotenv flask_httpauth gunicorn +COPY . /usr/share/nginx/html +RUN mv /usr/share/nginx/html/deploy / +RUN (cd /usr/share/nginx/html && git remote set-url origin https://github.com/SqrtMinusOne/sqrtminusone.github.io.git) +RUN rm /usr/share/nginx/html/index.html +CMD bash /deploy/entrypoint.sh diff --git a/deployer.py b/deploy/deployer.py similarity index 100% rename from deployer.py rename to deploy/deployer.py diff --git a/deploy/entrypoint.sh b/deploy/entrypoint.sh new file mode 100644 index 0000000..676b17f --- /dev/null +++ b/deploy/entrypoint.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +CWD=/usr/share/nginx/html +(cd $CWD && git fetch origin && git checkout origin/gh-pages) +(cd /deploy && gunicorn -w 1 "deployer:create_app()") & +nginx -g 'daemon off;' diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..e1563a6 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,9 @@ +version: "3.5" +services: + sqrtminusone.xyz: + restart: unless-stopped + container_name: "sqrtminusone.xyz" + build: . + ports: + - 8080:80 + - 8081:8000 diff --git a/repos/dotfiles b/repos/dotfiles index ba92551..78ecd7e 160000 --- a/repos/dotfiles +++ b/repos/dotfiles @@ -1 +1 @@ -Subproject commit ba92551ade9d231b2c13663f815b82804bcc60d3 +Subproject commit 78ecd7e1bba152ac73ea6206906384aea384c58a