diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4190a6f..f3af983 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -97,8 +97,6 @@ docker-build: fi - docker build --pull -t "$CI_REGISTRY_IMAGE${tag}" . - docker push "$CI_REGISTRY_IMAGE${tag}" - - docker build --pull --target cron -t "$CI_REGISTRY_IMAGE:cron-$CI_COMMIT_BRANCH" . - - docker push "$CI_REGISTRY_IMAGE:cron-$CI_COMMIT_BRANCH" # Run this job in a branch where a Dockerfile exists rules: - if: $CI_COMMIT_BRANCH diff --git a/Dockerfile b/Dockerfile index 36f19ae..649e829 100644 --- a/Dockerfile +++ b/Dockerfile @@ -49,17 +49,6 @@ COPY . ${APP_BASE}/${APP} RUN pip3 install -r requirements.txt RUN pip3 install psycopg2-binary -# Set the entrypoint to the web app -ENTRYPOINT exec flask run - -# Image for the cron service -FROM portal AS CRON - -# Run as root USER root - -# Setup the crontab RUN crontab -u ${APP} docker-crontab - -# Entrypoint for the cron service -ENTRYPOINT [ "cron", "-f" ] +# Set the entrypoint to the web app