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

Container shutdown speed fix #554

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Container shutdown speed fix #554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
782fb87
Fix docstring typo
Deelite34 Feb 24, 2024
468f20a
Fix container shutdown speed
Deelite34 Feb 24, 2024
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading