Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,3 @@ TRAEFIK_PUBLIC_TAG=traefik-public
DOCKER_IMAGE_BACKEND=backend
DOCKER_IMAGE_CELERYWORKER=celery
DOCKER_IMAGE_FRONTEND=frontend
DOCKER_IMAGE_NEW_FRONTEND=new-frontend
9 changes: 0 additions & 9 deletions docker-compose.override.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,15 +72,6 @@ services:
args:
INSTALL_DEV: ${INSTALL_DEV-true}

frontend:
build:
context: ./frontend
args:
FRONTEND_ENV: dev
labels:
# - traefik.http.routers.${STACK_NAME?Variable not set}-frontend-http.rule=PathPrefix(`/`)
- traefik.http.routers.${STACK_NAME?Variable not set}-frontend-http.rule=Host(`old-frontend.localhost.tiangolo.com`)

networks:
traefik-public:
# For local dev, don't expect an external Traefik network
Expand Down
26 changes: 7 additions & 19 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: "3.3"
services:

proxy:
image: traefik:v2.2
image: traefik:v2.3
networks:
- ${TRAEFIK_PUBLIC_NETWORK?Variable not set}
- default
Expand Down Expand Up @@ -167,24 +167,12 @@ services:
frontend:
image: '${DOCKER_IMAGE_FRONTEND?Variable not set}:${TAG-latest}'
build:
context: ./frontend
args:
FRONTEND_ENV: ${FRONTEND_ENV-production}
labels:
- traefik.enable=true
- traefik.constraint-label-stack=${TRAEFIK_TAG?Variable not set}
- traefik.http.routers.${STACK_NAME?Variable not set}-frontend-http.rule=PathPrefix(`/`)
- traefik.http.services.${STACK_NAME?Variable not set}-frontend.loadbalancer.server.port=80

# new-frontend:
# image: '${DOCKER_IMAGE_NEW_FRONTEND?Variable not set}:${TAG-latest}'
# build:
# context: ./new-frontend
# labels:
# - traefik.enable=true
# - traefik.constraint-label-stack=${TRAEFIK_TAG?Variable not set}
# - traefik.http.routers.${STACK_NAME?Variable not set}-new-frontend-http.rule=PathPrefix(`/`)
# - traefik.http.services.${STACK_NAME?Variable not set}-new-frontend.loadbalancer.server.port=80
context: ./new-frontend
labels:
- traefik.enable=true
- traefik.constraint-label-stack=${TRAEFIK_TAG?Variable not set}
- traefik.http.routers.${STACK_NAME?Variable not set}-frontend-http.rule=PathPrefix(`/`)
- traefik.http.services.${STACK_NAME?Variable not set}-frontend.loadbalancer.server.port=80

volumes:
app-db-data:
Expand Down
1 change: 0 additions & 1 deletion frontend/.dockerignore

This file was deleted.

9 changes: 0 additions & 9 deletions frontend/.env

This file was deleted.

21 changes: 0 additions & 21 deletions frontend/.gitignore

This file was deleted.

1 change: 0 additions & 1 deletion frontend/.nvmrc

This file was deleted.

30 changes: 0 additions & 30 deletions frontend/Dockerfile

This file was deleted.

46 changes: 0 additions & 46 deletions frontend/README.md

This file was deleted.

10 changes: 0 additions & 10 deletions frontend/babel.config.js

This file was deleted.

9 changes: 0 additions & 9 deletions frontend/nginx-backend-not-found.conf

This file was deleted.

11 changes: 0 additions & 11 deletions frontend/nginx.conf

This file was deleted.

74 changes: 0 additions & 74 deletions frontend/package.json

This file was deleted.

Binary file removed frontend/public/favicon.ico
Binary file not shown.
Binary file not shown.
Binary file removed frontend/public/img/icons/android-chrome-512x512.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed frontend/public/img/icons/apple-touch-icon-60x60.png
Binary file not shown.
Binary file removed frontend/public/img/icons/apple-touch-icon-76x76.png
Binary file not shown.
Binary file removed frontend/public/img/icons/apple-touch-icon.png
Binary file not shown.
Binary file removed frontend/public/img/icons/favicon-16x16.png
Binary file not shown.
Binary file removed frontend/public/img/icons/favicon-32x32.png
Binary file not shown.
Binary file not shown.
Binary file removed frontend/public/img/icons/mstile-150x150.png
Binary file not shown.
Loading