From 00530ed324a201aba741d7a454cce72f9ac1d18e Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Sun, 7 Nov 2021 22:24:48 -0700 Subject: [PATCH] Move Docker stuff to its own directory --- Dockerfile | 12 ------------ docker-compose.local.yaml | 21 --------------------- nginx.conf | 10 ---------- 3 files changed, 43 deletions(-) delete mode 100644 Dockerfile delete mode 100644 docker-compose.local.yaml delete mode 100644 nginx.conf diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index b578c4f..0000000 --- a/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM python:3 - -RUN useradd --system --gid root --uid 1001 uwsgi -RUN pip install uwsgi psycopg2_binary Flask Flask-Admin Flask-SQLAlchemy Flask-Bcrypt \ - Flask-Security-Too bcrypt email_validator pyyaml rst2html -RUN mkdir -p /app -WORKDIR /app -COPY . /app - -EXPOSE 3031 -CMD ["uwsgi", "--master", "--workers", "4", "--socket", "0.0.0.0:3031", "--protocol", "uwsgi", \ - "--plugin", "python3", "--uid", "uwsgi", "--wsgi", "libertywiki.wsgi"] diff --git a/docker-compose.local.yaml b/docker-compose.local.yaml deleted file mode 100644 index 8b6db8f..0000000 --- a/docker-compose.local.yaml +++ /dev/null @@ -1,21 +0,0 @@ -version: '3' -services: - wiki: - build: - context: . - environment: - - SQLALCHEMY_DATABASE_URI=postgresql://wiki:wiki@postgres/wiki - - SECRET_KEY=super-secret-key-replace-me - - SECURITY_PASSWORD_SALT=password-salt-replace-me - postgres: - image: postgres:14 - environment: - - POSTGRES_USER=wiki - - POSTGRES_PASSWORD=wiki - - POSTGRES_DB=wiki - nginx: - image: nginx - volumes: - - "./nginx.conf:/etc/nginx/conf.d/default.conf:ro" - ports: - - "8000:80" diff --git a/nginx.conf b/nginx.conf deleted file mode 100644 index 402dbc9..0000000 --- a/nginx.conf +++ /dev/null @@ -1,10 +0,0 @@ -server { - listen 80; - listen [::]:80; - server_name _; - - location / { - include uwsgi_params; - uwsgi_pass wiki:3031; - } -}