Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
webgeodyn
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor 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
Geodynamo
webgeodyn
Commits
37b7b7da
Commit
37b7b7da
authored
1 year ago
by
Francois Dall'Asta
Browse files
Options
Downloads
Patches
Plain Diff
[docker-build] update .gitlab-ci.yml and Dockerfile
parent
2dfc96ad
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+17
-14
17 additions, 14 deletions
.gitlab-ci.yml
Dockerfile
+3
-0
3 additions, 0 deletions
Dockerfile
with
20 additions
and
14 deletions
.gitlab-ci.yml
+
17
−
14
View file @
37b7b7da
...
...
@@ -23,18 +23,19 @@ docker-build:
-
/kaniko/executor
--context $CI_PROJECT_DIR
--dockerfile Dockerfile
--destination $CI_REGISTRY_IMAGE/
env
-ubuntu:22.04
--destination $CI_REGISTRY_IMAGE/
webgeodyn
-ubuntu:22.04
rules
:
-
if
:
$CI_COMMIT_MESSAGE =~ /\[docker-build]/
when
:
always
test_with_coverage
:
image
:
name
:
$CI_REGISTRY_IMAGE/env-ubuntu:22.04
name
:
$CI_REGISTRY_IMAGE/webgeodyn-ubuntu:22.04
variables
:
GIT_STRATEGY
:
clone
stage
:
run
script
:
-
pip3 install .
-
pip3 install coverage
-
coverage run --source $(pwd) --omit="webgeodyn/tests/*" setup.py test
-
coverage report
-
coverage html
...
...
@@ -45,25 +46,26 @@ test_with_coverage:
coverage
:
"
/TOTAL.+
([0-9]{1,3}%)/"
rules
:
-
if
:
$CI_COMMIT_REF_NAME == "master"
when
:
alway
s
when
:
on_succes
s
generate_rst
:
image
:
name
:
$CI_REGISTRY_IMAGE/env-ubuntu:22.04
name
:
$CI_REGISTRY_IMAGE/webgeodyn-ubuntu:22.04
variables
:
GIT_STRATEGY
:
clone
stage
:
run
script
:
-
pip3 install sphinx
-
cd doc/ && ./make_all_doc.sh && cd ..
artifacts
:
paths
:
-
doc/html
rules
:
-
if
:
$CI_COMMIT_REF_NAME == "master"
when
:
alway
s
when
:
on_succes
s
pages
:
image
:
name
:
$CI_REGISTRY_IMAGE/
env
-ubuntu:22.04
name
:
$CI_REGISTRY_IMAGE/
webgeodyn
-ubuntu:22.04
stage
:
deploy
variables
:
GIT_STRATEGY
:
none
...
...
@@ -81,18 +83,19 @@ pages:
-
generate_rst
rules
:
-
if
:
$CI_COMMIT_REF_NAME == "master"
when
:
alway
s
when
:
on_succes
s
pypi_upload
:
image
:
name
:
$CI_REGISTRY_IMAGE/env-ubuntu:22.04
name
:
$CI_REGISTRY_IMAGE/webgeodyn-ubuntu:22.04
variables
:
GIT_STRATEGY
:
clone
stage
:
release
script
:
-
pip3 install twine
-
python3 setup.py sdist bdist_wheel
-
python3 -m twine check dist/*
-
python3 -m twine upload dist/*
only
:
variables
:
-
$CI_COMMIT_TAG =~ /^\d+\.\d+\.\d+$/
rules
:
-
if
:
$CI_COMMIT_TAG =~ /^\d+\.\d+\.\d+$/
when
:
on_success
This diff is collapsed.
Click to expand it.
Dockerfile
+
3
−
0
View file @
37b7b7da
...
...
@@ -4,3 +4,6 @@ RUN apt-get update && apt-get install -y -qq \
python3
\
python3-pip
RUN
apt-get autoclean
-y
&&
apt-get autoremove
-y
&&
rm
-rf
/var/lib/apt/lists/
*
RUN
pip3
install
coverage
RUN
pip3
install
sphinx
RUN
pip3
install
twine
\ No newline at end of file
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