Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-01-24 07:29:08 -05:00
Code Issues Activity

💚 Fix docker-compose run

Browse source
This commit is contained in:
mathieu.brunot 2019-02-16 15:55:21 +01:00
parent f035228072
commit 4b9195e8e5
No known key found for this signature in database
GPG key ID: 81584BEAF692D7E0
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
docker-compose.yml
View file

@ -18,6 +18,8 @@ services:
- "POSTGRES_PASSWORD=uxbox_postgres_password" - "POSTGRES_PASSWORD=uxbox_postgres_password"
volumes: volumes:
- db_data:/var/lib/postgresql/data - db_data:/var/lib/postgresql/data
- /etc/localtime:/etc/localtime:ro
- /etc/timezone:/etc/timezone:ro
uxbackend: uxbackend:
build: ./backend build: ./backend
@ -59,14 +61,15 @@ services:
build: ./frontend build: ./frontend
#image: monogramm/uxbox:frontend #image: monogramm/uxbox:frontend
container_name: uxfrontend container_name: uxfrontend
#hostname: uxbox.${DOMAIN} #hostname: uxbox.io
#restart: always #restart: always
depends_on: depends_on:
- uxbackend - uxbackend
ports: ports:
- 80:80 - 80:80
environment: environment:
#- "API_URL=http://uxbox.${DOMAIN}/api/" - "API_URL=http://localhost:6060/api/"
#- "API_URL=http://uxbox.io/api/"
volumes: volumes:
#- /srv/uxbox/frontend/html:/usr/share/nginx/html #- /srv/uxbox/frontend/html:/usr/share/nginx/html
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro

5
frontend/docker-nginx/conf.d/default.conf
View file

@ -25,7 +25,8 @@ server {
# Reverse Proxy to Backend (Avoids XSS concerns) --Update api to be whatever your site uses to access your backend # Reverse Proxy to Backend (Avoids XSS concerns) --Update api to be whatever your site uses to access your backend
location /api/ { location /api/ {
proxy_pass http://backend; #proxy_pass http://backend;
proxy_pass http://uxbackend:6060;
proxy_http_version 1.1; proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection 'upgrade'; proxy_set_header Connection 'upgrade';
@ -35,7 +36,7 @@ server {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
# IMPORTANT: Update my.uxbox.com to your production site. This will allow cookies to work as expected when using your deployment locally # IMPORTANT: Update my.uxbox.com to your production site. This will allow cookies to work as expected when using your deployment locally
proxy_cookie_domain localhost my.uxbox.com; #proxy_cookie_domain localhost my.uxbox.com;
} }
# Application # Application