Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
CrysFML
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
4
Issues
4
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Scientific Software
CrysFML
Commits
3c4f1bed
Commit
3c4f1bed
authored
May 14, 2020
by
Remi Perenon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Solving minor Docker issues
parent
4c09d30b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
BuildServer/Docker/Dockerfile_build_xenial_gfortran
BuildServer/Docker/Dockerfile_build_xenial_gfortran
+1
-1
BuildServer/Docker/Dockerfile_build_xenial_ifort
BuildServer/Docker/Dockerfile_build_xenial_ifort
+1
-1
BuildServer/Docker/clean.sh
BuildServer/Docker/clean.sh
+2
-2
No files found.
BuildServer/Docker/Dockerfile_build_xenial_gfortran
View file @
3c4f1bed
...
...
@@ -11,4 +11,4 @@ ENV CI_COMMIT_REF_NAME=${CI_COMMIT_REF_NAME}
COPY ./ /app/
WORKDIR /app
CMD BuildServer/Unix/build.sh gfortran; cp -a build_gfortran /artifacts/
\ No newline at end of file
CMD BuildServer/Unix/build.sh gfortran && cp -a build_gfortran /artifacts/
\ No newline at end of file
BuildServer/Docker/Dockerfile_build_xenial_ifort
View file @
3c4f1bed
...
...
@@ -12,4 +12,4 @@ ENV HDF5_INCLUDE_PATH=/hdf5/include
COPY ./ /app/
WORKDIR /app
CMD BuildServer/Unix/build.sh ifort; cp -a build_ifort /artifacts/
\ No newline at end of file
CMD BuildServer/Unix/build.sh ifort && cp -a build_ifort /artifacts/
\ No newline at end of file
BuildServer/Docker/clean.sh
View file @
3c4f1bed
# Return the docker containers that are exited
exited_containers
=
`
docker ps
-q
-f
"status=exited"
`
exited_containers
=
`
docker ps
-q
"status=exited"
`
# If some have been found, remove them
if
[
-n
"
$exited_containers
"
]
then
...
...
@@ -7,7 +7,7 @@ then
fi
# Return the docker images that are in dangling state
images
=
`
docker images
-q
-f
"dangling=true"
`
images
=
`
docker images
-q
"dangling=true"
`
# If some dangling images have been found, remove them
if
[
-n
"
$images
"
]
then
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment