Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
geomag-algorithms
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ghsc
National Geomagnetism Program
geomag-algorithms
Commits
31cc7e10
Commit
31cc7e10
authored
4 years ago
by
Jeremy M Fee
Browse files
Options
Downloads
Patches
Plain Diff
Simplify build
parent
b131e133
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!146
Release CMO metadata to production
,
!56
Update how container builds (remove conda)
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+1
-0
1 addition, 0 deletions
.gitlab-ci.yml
Dockerfile
+2
-8
2 additions, 8 deletions
Dockerfile
with
3 additions
and
8 deletions
.gitlab-ci.yml
+
1
−
0
View file @
31cc7e10
...
@@ -78,6 +78,7 @@ variables:
...
@@ -78,6 +78,7 @@ variables:
-
pipenv run which python
-
pipenv run which python
image
:
${DEVOPS_REGISTRY}usgs/obspy:latest
image
:
${DEVOPS_REGISTRY}usgs/obspy:latest
script
:
script
:
# run checks
-
pipenv run black --check .
-
pipenv run black --check .
-
pipenv run pytest --cov-report xml:cov.xml --cov=geomagio
-
pipenv run pytest --cov-report xml:cov.xml --cov=geomagio
-
pipenv run safety check
-
pipenv run safety check
...
...
This diff is collapsed.
Click to expand it.
Dockerfile
+
2
−
8
View file @
31cc7e10
...
@@ -5,7 +5,7 @@ LABEL maintainer="Jeremy Fee <jmfee@usgs.gov>"
...
@@ -5,7 +5,7 @@ LABEL maintainer="Jeremy Fee <jmfee@usgs.gov>"
ARG
GIT_BRANCH_NAME=none
ARG
GIT_BRANCH_NAME=none
ARG
GIT_COMMIT_SHA=none
ARG
GIT_COMMIT_SHA=none
ARG
WEBSERVICE="
tru
e"
ARG
WEBSERVICE="
fals
e"
# set environment variables
# set environment variables
ENV
GIT_BRANCH_NAME=${GIT_BRANCH_NAME} \
ENV
GIT_BRANCH_NAME=${GIT_BRANCH_NAME} \
...
@@ -27,13 +27,7 @@ USER geomag_user
...
@@ -27,13 +27,7 @@ USER geomag_user
# install dependencies via pipenv
# install dependencies via pipenv
WORKDIR
/data
WORKDIR
/data
COPY
Pipfile /data/
COPY
Pipfile /data/
RUN if
[
"
${
WEBSERVICE
}
"
=
"true"
]
;
then
\
RUN
pipenv
--site-packages
install
--dev
--skip-lock
# only install production packages for webservice
pipenv --site-packages install --skip-lock; \
else \
# install everything
pipenv --site-packages install --dev --skip-lock; \
fi
# copy library (ignores set in .dockerignore)
# copy library (ignores set in .dockerignore)
COPY
. /geomag-algorithms
COPY
. /geomag-algorithms
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment