Compare commits
No commits in common. "2fdf6606b33d2d6c8d038329e76b9bc3669f819b" and "c9b54cd4c5e6328273e33bdb3208fe907c6c0e3c" have entirely different histories.
2fdf6606b3
...
c9b54cd4c5
@ -15,6 +15,3 @@ RUN pip install -r requirements.txt
|
|||||||
# Copy rest of project into workspace
|
# Copy rest of project into workspace
|
||||||
COPY . /konova/
|
COPY . /konova/
|
||||||
|
|
||||||
# Move static files in designated folder
|
|
||||||
RUN python manage.py collectstatic --noinput
|
|
||||||
|
|
||||||
|
@ -3,7 +3,6 @@ version: '3.3'
|
|||||||
services:
|
services:
|
||||||
redis:
|
redis:
|
||||||
image: redis
|
image: redis
|
||||||
container_name: "konova-redis-cache"
|
|
||||||
volumes:
|
volumes:
|
||||||
- /redis/data:/bitnami/redis/data
|
- /redis/data:/bitnami/redis/data
|
||||||
environment:
|
environment:
|
||||||
@ -14,18 +13,17 @@ services:
|
|||||||
- postgis:db
|
- postgis:db
|
||||||
build: .
|
build: .
|
||||||
container_name: "konova-docker"
|
container_name: "konova-docker"
|
||||||
command: gunicorn konova.wsgi:application --bind 0.0.0.0:8000
|
command: python manage.py runserver 0.0.0.0:8000
|
||||||
volumes:
|
volumes:
|
||||||
- .:/konova
|
- .:/konova
|
||||||
- static_file_volume:/konova/static # Point to the volume for static files. Shared with nginx service
|
ports:
|
||||||
expose:
|
- "8001:8000"
|
||||||
- 8000
|
|
||||||
depends_on:
|
depends_on:
|
||||||
- redis
|
- redis
|
||||||
environment:
|
environment:
|
||||||
- POSTGRES_NAME=konova
|
- POSTGRES_NAME=konova
|
||||||
- POSTGRES_PORT=5432
|
- POSTGRES_PORT=5432
|
||||||
- POSTGRES_PASSWORD=CHANGE_ME
|
- POSTGRES_PASSWORD=michel
|
||||||
- POSTGRES_USER=konova
|
- POSTGRES_USER=konova
|
||||||
- POSTGRES_HOST=db
|
- POSTGRES_HOST=db
|
||||||
- REDIS_HOST=redis
|
- REDIS_HOST=redis
|
||||||
@ -44,27 +42,14 @@ services:
|
|||||||
environment:
|
environment:
|
||||||
- POSTGRES_NAME=konova
|
- POSTGRES_NAME=konova
|
||||||
- POSTGRES_PORT=5432
|
- POSTGRES_PORT=5432
|
||||||
- POSTGRES_PASSWORD=CHANGE_ME
|
- POSTGRES_PASSWORD=michel
|
||||||
- POSTGRES_USER=konova
|
- POSTGRES_USER=konova
|
||||||
- POSTGRES_HOST=db
|
- POSTGRES_HOST=db
|
||||||
- REDIS_HOST=redis
|
- REDIS_HOST=redis
|
||||||
|
|
||||||
nginx:
|
|
||||||
build: ./nginx
|
|
||||||
container_name: "konova-nginx-server"
|
|
||||||
ports:
|
|
||||||
- "1337:80"
|
|
||||||
depends_on:
|
|
||||||
- konova
|
|
||||||
volumes:
|
|
||||||
- static_file_volume:/konova/static # Point to the volume for static files. Shared with konova service
|
|
||||||
|
|
||||||
# Instead of an own, new network, we need to connect to the existing one, which is provided by the postgis container
|
# 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
|
# NOTE: THIS NETWORK MUST EXIST
|
||||||
networks:
|
networks:
|
||||||
default:
|
default:
|
||||||
external:
|
external:
|
||||||
name: postgis_nat_it_backend
|
name: postgis_nat_it_backend
|
||||||
|
|
||||||
volumes:
|
|
||||||
static_file_volume:
|
|
@ -30,7 +30,7 @@ BASE_DIR = os.path.dirname(
|
|||||||
SECRET_KEY = '5=9-)2)h$u9=!zrhia9=lj-2#cpcb8=#$7y+)l$5tto$3q(n_+'
|
SECRET_KEY = '5=9-)2)h$u9=!zrhia9=lj-2#cpcb8=#$7y+)l$5tto$3q(n_+'
|
||||||
|
|
||||||
# SECURITY WARNING: don't run with debug turned on in production!
|
# SECURITY WARNING: don't run with debug turned on in production!
|
||||||
DEBUG = False
|
DEBUG = True
|
||||||
|
|
||||||
ALLOWED_HOSTS = [
|
ALLOWED_HOSTS = [
|
||||||
"127.0.0.1",
|
"127.0.0.1",
|
||||||
|
@ -1,4 +0,0 @@
|
|||||||
FROM nginx:alpine
|
|
||||||
|
|
||||||
RUN rm /etc/nginx/conf.d/default.conf
|
|
||||||
COPY nginx.conf /etc/nginx/conf.d
|
|
@ -1,20 +0,0 @@
|
|||||||
upstream konova {
|
|
||||||
server konova: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/;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -48,4 +48,3 @@ webservices==0.7
|
|||||||
wrapt==1.13.3
|
wrapt==1.13.3
|
||||||
xmltodict==0.12.0
|
xmltodict==0.12.0
|
||||||
zipp==3.4.1
|
zipp==3.4.1
|
||||||
gunicorn==20.1.0
|
|
Loading…
Reference in New Issue
Block a user