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
900e32f6
Commit
900e32f6
authored
4 years ago
by
Jeremy M Fee
Browse files
Options
Downloads
Patches
Plain Diff
Update pipenv install command, add ssl_cert environment vars, add git environment vars/args
parent
5f548d4f
No related branches found
No related tags found
No related merge requests found
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Dockerfile
+11
-4
11 additions, 4 deletions
Dockerfile
Pipfile
+1
-1
1 addition, 1 deletion
Pipfile
Pipfile.lock
+206
-169
206 additions, 169 deletions
Pipfile.lock
with
218 additions
and
174 deletions
Dockerfile
+
11
−
4
View file @
900e32f6
...
@@ -3,12 +3,19 @@ ARG FROM_IMAGE=usgs/centos:latest
...
@@ -3,12 +3,19 @@ ARG FROM_IMAGE=usgs/centos:latest
FROM
${FROM_IMAGE}
FROM
${FROM_IMAGE}
LABEL
maintainer="Jeremy Fee <jmfee@usgs.gov>"
LABEL
maintainer="Jeremy Fee <jmfee@usgs.gov>"
ARG
GIT_BRANCH_NAME=none
ARG
GIT_COMMIT_SHA=none
# set environment variables
# set environment variables
ENV
LANG='en_US.UTF-8' \
ENV
GIT_BRANCH_NAME=${GIT_BRANCH_NAME} \
GIT_COMMIT_SHA=${GIT_COMMIT_SHA} \
LANG='en_US.UTF-8' \
LC_ALL='en_US.UTF-8' \
LC_ALL='en_US.UTF-8' \
PATH=/conda/bin:$PATH \
PATH=/conda/bin:$PATH \
PIP_CERT=${SSL_CERT_FILE} \
PYTHONDONTWRITEBYTECODE=1 \
PYTHONDONTWRITEBYTECODE=1 \
PYTHONUNBUFFERED=1
PYTHONUNBUFFERED=1 \
REQUESTS_CA_BUNDLE=${SSL_CERT_FILE}
# install conda
# install conda
RUN
echo
'export PATH=/conda/bin:$PATH'
>
/etc/profile.d/conda.sh
\
RUN
echo
'export PATH=/conda/bin:$PATH'
>
/etc/profile.d/conda.sh
\
...
@@ -41,8 +48,8 @@ USER geomag_user
...
@@ -41,8 +48,8 @@ USER geomag_user
# install dependencies via pipenv
# install dependencies via pipenv
WORKDIR
/data
WORKDIR
/data
COPY
Pipfile
Pipfile.lock
/data/
COPY
Pipfile /data/
RUN
pipenv
install
--s
ite-packages
RUN
pipenv
--site-packages
install
--s
kip-lock
# 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.
Pipfile
+
1
−
1
View file @
900e32f6
...
@@ -13,7 +13,7 @@ webtest = "*"
...
@@ -13,7 +13,7 @@ webtest = "*"
[packages]
[packages]
numpy
=
"*"
numpy
=
"*"
scipy
=
"*"
scipy
=
"*"
obspy
=
"
>1.2.0
"
obspy
=
"
*
"
pycurl
=
"*"
pycurl
=
"*"
authlib
=
"*"
authlib
=
"*"
cryptography
=
"*"
cryptography
=
"*"
...
...
This diff is collapsed.
Click to expand it.
Pipfile.lock
+
206
−
169
View file @
900e32f6
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