bofh/fet2020
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

multiple fixes Dockerfile

Browse Source
This commit is contained in:
root (lxc-fetsite-04)
2020-09-16 19:49:43 +02:00
parent c6a22b91fc
commit e687621e40
4 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -8,4 +8,5 @@ fet2020/*/migrations/*
.theia/* .theia/*
.flake8 .flake8
migrate migrate
run run
*.pid

3
Dockerfile
View File

@@ -20,7 +20,8 @@ COPY --from=builder /opt/venv /opt/venv
# Make sure we use the virtualenv: # Make sure we use the virtualenv:
ENV PATH="/opt/venv/bin:$PATH" ENV PATH="/opt/venv/bin:$PATH"
#COPY ./fet2020 /app COPY ./fet2020 /app
COPY ./deployment/nginx.conf /etc/nginx/conf.d/nginx.conf
RUN python manage.py makemigrations && python manage.py makemigrations posts members RUN python manage.py makemigrations && python manage.py makemigrations posts members

7
deployment/nginx.conf Normal file
View File

@@ -0,0 +1,7 @@
server {
listen 80;
location / {
include uwsgi_params;
uwsgi_pass unix:///tmp/uwsgi.sock;
}
}

8
run_container
View File

@@ -1,5 +1,5 @@
docker stop bb2 #docker stop bb2
docker container rm bb2 #docker container rm bb2
docker build -t test1 . docker build -t fet2020django .
docker network create fet-net docker network create fet-net
docker run --name fetdjango --network fet-net -d -p 8080:80 test1 docker run --name fetdjango --network fet-net -d -p 8080:80 -v /srv/deploy_1/app/fet2020:/app fet2020django