From 31cc7e107e0b503bb59853b3dd72c2e97e579af7 Mon Sep 17 00:00:00 2001
From: Jeremy Fee <jmfee@usgs.gov>
Date: Fri, 4 Dec 2020 20:37:48 -0700
Subject: [PATCH] Simplify build
---
.gitlab-ci.yml | 1 +
Dockerfile | 10 ++--------
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d906b1ea..37902f1a 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 203f160a..d78f30c1 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
--
GitLab