diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d906b1ea1ccec4429f48f34bdb8df215581bfb25..37902f1ad9a1fabde21269c0d0d386242ea8c8bb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -78,6 +78,7 @@ variables: - pipenv run which python image: ${DEVOPS_REGISTRY}usgs/obspy:latest script: + # run checks - pipenv run black --check . - pipenv run pytest --cov-report xml:cov.xml --cov=geomagio - pipenv run safety check diff --git a/Dockerfile b/Dockerfile index 203f160acbe8b67f12ea98f49849c1c90911b88d..d78f30c1c7f979ffbc8db5119d67a94591262dde 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ LABEL maintainer="Jeremy Fee <jmfee@usgs.gov>" ARG GIT_BRANCH_NAME=none ARG GIT_COMMIT_SHA=none -ARG WEBSERVICE="true" +ARG WEBSERVICE="false" # set environment variables ENV GIT_BRANCH_NAME=${GIT_BRANCH_NAME} \ @@ -27,13 +27,7 @@ USER geomag_user # install dependencies via pipenv WORKDIR /data COPY Pipfile /data/ -RUN if [ "${WEBSERVICE}" = "true" ]; then \ - # only install production packages for webservice - pipenv --site-packages install --skip-lock; \ - else \ - # install everything - pipenv --site-packages install --dev --skip-lock; \ - fi +RUN pipenv --site-packages install --dev --skip-lock # copy library (ignores set in .dockerignore) COPY . /geomag-algorithms