Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use nginx with all local versions #56

Merged
merged 2 commits into from
Jun 20, 2021
Merged

use nginx with all local versions #56

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe025e1
use nginx with all local versions
wwick Jun 6, 2021
09719a3
no nginx for basic yaml
wwick Jun 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions local-stupoli.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: "3"
version: "3.8"

volumes:
local_postgres_data: {}
Expand Down Expand Up @@ -41,10 +41,10 @@ services:
image: nginx:1.19
container_name: nginx
ports:
- 80:80
- 8000:8000
environment:
- NGINX_HOST=localhost
- NGINX_PORT=80
- NGINX_PORT=8000
- NGINX_REVERSE_PROXY=django:8000
volumes:
- ./compose/local/nginx/templates:/etc/nginx/templates
Expand Down
35 changes: 26 additions & 9 deletions local-umkc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '3'
version: '3.8'

volumes:
local_postgres_data: {}
Expand All @@ -19,11 +19,10 @@ services:
- ./.envs/.local/.django
- ./.envs/.local/.postgres
- ./.envs/.local/.umkc
ports:
- "8000:8000"
command: /start
links:
- selenium
networks:
- nginx_network
- database_network

postgres:
build:
Expand All @@ -36,9 +35,27 @@ services:
- local_postgres_data_backups:/backups
env_file:
- ./.envs/.local/.postgres
networks:
- database_network

selenium:
image: selenium/standalone-chrome-debug:3.141
nginx:
image: nginx:1.19
container_name: nginx
ports:
- 4444:4444 # Selenium
- 5900:5900 # VNC server
- 8000:8000
environment:
- NGINX_HOST=localhost
- NGINX_PORT=8000
- NGINX_REVERSE_PROXY=django:8000
volumes:
- ./compose/local/nginx/templates:/etc/nginx/templates
depends_on:
- django
networks:
- nginx_network

networks:
nginx_network:
driver: bridge
database_network:
driver: bridge
41 changes: 35 additions & 6 deletions local.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '3'
version: '3.8'

volumes:
local_postgres_data: {}
Expand All @@ -13,16 +13,17 @@ services:
container_name: django
depends_on:
- postgres
- selenium
volumes:
- .:/app
env_file:
- ./.envs/.local/.django
- ./.envs/.local/.postgres
ports:
- "8000:8000"
command: /start
links:
- selenium
networks:
- selenium_network
- database_network
- nginx_network

postgres:
build:
Expand All @@ -35,13 +36,33 @@ services:
- local_postgres_data_backups:/backups
env_file:
- ./.envs/.local/.postgres
networks:
- database_network

nginx:
image: nginx:1.19
container_name: nginx
ports:
- 8000:8000
environment:
- NGINX_HOST=localhost
- NGINX_PORT=8000
- NGINX_REVERSE_PROXY=django:8000
volumes:
- ./compose/local/nginx/templates:/etc/nginx/templates
depends_on:
- django
networks:
- nginx_network

selenium:
container_name: selenium
image: selenium/standalone-chrome-debug:3.141
ports:
- 4444:4444 # Selenium
- 5900:5900 # VNC server

networks:
- selenium_network

docs:
image: osler_local_docs
Expand All @@ -58,3 +79,11 @@ services:
ports:
- "7000:7000"
command: /start-docs

networks:
nginx_network:
driver: bridge
database_network:
driver: bridge
selenium_network:
driver: bridge
2 changes: 0 additions & 2 deletions osler/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
<script src="https://cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv.min.js"></script>
<![endif]-->

<link rel="icon" href="{% static 'images/favicons/favicon.ico' %}">

{% block css %}

<!-- Latest compiled and minified Bootstrap CSS -->
Expand Down