Skip to content

Commit

Permalink
Fixing Dockerfile, deploy via ghcr.io
Browse files Browse the repository at this point in the history
  • Loading branch information
holtgrewe committed Sep 3, 2021
1 parent dad5750 commit c95a97f
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
6 changes: 5 additions & 1 deletion docker/Dockerfile
@@ -1,4 +1,7 @@
FROM python:3.6-buster
FROM python:3.8-buster

MAINTAINER Manuel Holtgrewe <manuel.holtgrewe@bih-charite.de>
LABEL org.opencontainers.image.source https://github.com/bihealth/varfish-server

ARG app_git_url=https://github.com/bihealth/varfish-server.git
ARG app_git_tag
Expand Down Expand Up @@ -110,6 +113,7 @@ RUN cd /usr/src/app && \
DJANGO_SECRET_KEY=for-build-only \
DJANGO_SETTINGS_MODULE=config.settings.production \
DATABASE_URL=postgres://varfish:varfish@fake/varfish \
python manage.py geticons && \
python manage.py collectstatic --no-input

# Define the entry point.
Expand Down
2 changes: 1 addition & 1 deletion docker/build-docker.sh
Expand Up @@ -15,4 +15,4 @@ docker build . \
--build-arg app_git_tag=$GIT_TAG \
--build-arg app_git_depth=$GIT_DEPTH \
--build-arg app_git_url=$GIT_URL \
-t bihealth/varfish-server:$DOCKER_VERSION
-t ghcr.io/bihealth/varfish-server:$DOCKER_VERSION
6 changes: 4 additions & 2 deletions docker/docker-entrypoint.sh
Expand Up @@ -69,17 +69,19 @@ if [[ "$1" == wsgi ]]; then
elif [[ "$1" == celeryd ]]; then
cd $APP_DIR

exec celery worker \
exec celery \
--app config.celery_app \
worker \
-Q "${CELERY_QUEUES}" \
--concurrency "${CELERY_WORKERS}" \
--loglevel info
elif [[ "$1" == celerybeat ]]; then
cd $APP_DIR
rm -f celerybeat.pid

exec celery beat \
exec celery \
--max-interval 30 \
beat \
--app config.celery_app \
--loglevel info
else
Expand Down

0 comments on commit c95a97f

Please sign in to comment.