Revert "Merge branch 'Docker' into master"
This reverts commitpull/184/head8c47c8ae35
, reversing changes made to2206565673
. Undos accidental remote merge
parent
8c47c8ae35
commit
a955e9f564
@ -1,24 +0,0 @@
|
|||||||
FROM python:3.9-slim
|
|
||||||
ENV PYTHONUNBUFFERED 1
|
|
||||||
|
|
||||||
WORKDIR /konova
|
|
||||||
|
|
||||||
# Install some dependencies
|
|
||||||
RUN apt update
|
|
||||||
RUN apt install -y gdal-bin redis-server nginx
|
|
||||||
|
|
||||||
# Copy requirements file into workspace and install all dependencies
|
|
||||||
COPY ./requirements.txt /konova/
|
|
||||||
RUN pip install --upgrade pip
|
|
||||||
RUN pip install -r requirements.txt
|
|
||||||
|
|
||||||
# Remove nginx default configuration and replace with own configuration
|
|
||||||
RUN rm /etc/nginx/sites-enabled/default
|
|
||||||
COPY ./nginx.conf /etc/nginx/conf.d
|
|
||||||
|
|
||||||
# Copy rest of project into workspace
|
|
||||||
COPY . /konova/
|
|
||||||
|
|
||||||
# Move static files in designated folder
|
|
||||||
RUN python manage.py collectstatic --noinput
|
|
||||||
|
|
@ -1,34 +0,0 @@
|
|||||||
version: '3.3'
|
|
||||||
|
|
||||||
services:
|
|
||||||
konova:
|
|
||||||
external_links:
|
|
||||||
- postgis:db
|
|
||||||
- arnova-nginx-server:arnova
|
|
||||||
build: .
|
|
||||||
container_name: "konova-docker"
|
|
||||||
command: ./docker-entrypoint.sh
|
|
||||||
restart: always
|
|
||||||
volumes:
|
|
||||||
- .:/konova
|
|
||||||
- /data/apps/konova/uploaded_files:/konova_uploaded_files
|
|
||||||
ports:
|
|
||||||
- "1337:80"
|
|
||||||
environment:
|
|
||||||
- POSTGRES_NAME=konova
|
|
||||||
- POSTGRES_PORT=5432
|
|
||||||
- POSTGRES_PASSWORD=CHANGE_ME
|
|
||||||
- POSTGRES_USER=konova
|
|
||||||
- POSTGRES_HOST=db
|
|
||||||
- REDIS_HOST=localhost
|
|
||||||
- SSO_HOST=CHANGE_ME_TO_SSO_HOST_URL
|
|
||||||
- SMTP_HOST=172.17.0.1
|
|
||||||
- SMTP_PORT=25
|
|
||||||
- SMTP_REAL_REPLY_MAIL=ksp-servicestelle@sgdnord.rlp.de
|
|
||||||
|
|
||||||
# Instead of an own, new network, we need to connect to the existing one, which is provided by the postgis container
|
|
||||||
# NOTE: THIS NETWORK MUST EXIST
|
|
||||||
networks:
|
|
||||||
default:
|
|
||||||
external:
|
|
||||||
name: postgis_nat_it_backend
|
|
@ -1,7 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
# Start all needed services once the container is fired up!
|
|
||||||
service nginx start
|
|
||||||
service redis-server start
|
|
||||||
celery -A konova worker --detach
|
|
||||||
# Rule of thumb: (2*CPU)+1 as worker_num -> Use 5 as default (matches a dual core)
|
|
||||||
gunicorn --workers=5 konova.wsgi:application --bind=0.0.0.0:8000
|
|
@ -1,20 +0,0 @@
|
|||||||
upstream konova {
|
|
||||||
server localhost:8000;
|
|
||||||
}
|
|
||||||
|
|
||||||
server {
|
|
||||||
|
|
||||||
listen 80;
|
|
||||||
|
|
||||||
location / {
|
|
||||||
proxy_pass http://konova;
|
|
||||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
|
||||||
proxy_set_header Host $host;
|
|
||||||
proxy_redirect off;
|
|
||||||
}
|
|
||||||
|
|
||||||
location /static/ {
|
|
||||||
alias /konova/static/;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
Loading…
Reference in New Issue