Skip to content
Open
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
2 changes: 1 addition & 1 deletion backend/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ class StagingConfig(Config):

class DevelopmentConfig(Config):
"""
Used for https://localhost:8088/ (Docker)
Used for https://localhost:8080/ (Docker)
"""

pass
2 changes: 1 addition & 1 deletion backend/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ getent hosts host.docker.internal >/dev/null || \
wait-for-it "${DB_HOST}:${DB_PORT}"
flask db migrate
flask db upgrade
flask run --host=0.0.0.0
exec flask run --host=0.0.0.0
2 changes: 2 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ services:
- ./frontend:/cfp_v3/frontend
environment:
- VUE_APP_AXIOS_BASE_URL=http://0.0.0.0:5000/
init: true

backend:
container_name: cfp_v3_backend
Expand All @@ -36,6 +37,7 @@ services:
MAIL_USERNAME: ${MAIL_USERNAME:-}
MAIL_PASSWORD: ${MAIL_PASSWORD:-}
MAIL_SUPPRESS_SEND: ${MAIL_SUPPRESS_SEND:-TRUE}
init: true

db:
container_name: cfp_v3_db
Expand Down
4 changes: 2 additions & 2 deletions frontend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ EXPOSE 8080
ADD . /cfp_v3/frontend
WORKDIR /cfp_v3/frontend

RUN yarn install
RUN ["yarn", "install"]

ENTRYPOINT bash docker-entrypoint.sh
ENTRYPOINT ["bash", "docker-entrypoint.sh"]
3 changes: 1 addition & 2 deletions frontend/docker-entrypoint.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
#!/bin/bash

# https://github.com/docker/for-linux/issues/264
getent hosts host.docker.internal >/dev/null || \
echo "$(ip route list match 0/0 | cut -d' ' -f3) host.docker.internal" \
| tee -a /etc/hosts >/dev/null

yarn install
yarn serve --host 0.0.0.0
exec yarn serve --host 0.0.0.0