Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Volodymyr SAVCHENKO
osa-docker
Commits
5ace5e83
Verified
Commit
5ace5e83
authored
Oct 05, 2018
by
Volodymyr SAVCHENKO
Browse files
autodetect osa version
parent
624d9864
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
6 deletions
+10
-6
Dockerfile
Dockerfile
+5
-3
Makefile
Makefile
+5
-3
No files found.
Dockerfile
View file @
5ace5e83
...
...
@@ -38,10 +38,12 @@ RUN cd /opt && \
# OSA
ARG
OSA_VERSION=11.0-beta-1-g553922fd-20181005-101240
RUN
cd
/opt
&&
\
wget https://www.isdc.unige.ch/~savchenk/gitlab-ci/savchenk/osa-build-binary-tarball/CentOS_7.5.1804_x86_64/
11.0/osa-build-binary-tarball.latest/osa
-CentOS_7.5.1804_x86_64.tar.gz
&&
\
tar
xvzf osa-CentOS_7.5.1804_x86_64.tar.gz
&&
\
rm
-fv
osa-CentOS_7.5.1804_x86_64.tar.gz
wget https://www.isdc.unige.ch/~savchenk/gitlab-ci/savchenk/osa-build-binary-tarball/CentOS_7.5.1804_x86_64/
${
OSA_VERSION
}
/build-latest/osa-
${
OSA_VERSION
}
-CentOS_7
.5.1804_x86_64.tar.gz
&&
\
tar
xvzf osa-
${
OSA_VERSION
}
-
CentOS_7
.5.1804_x86_64.tar.gz
&&
\
rm
-fv
osa-
${
OSA_VERSION
}
-
CentOS_7
.5.1804_x86_64.tar.gz
RUN
wget https://www.isdc.unige.ch/integral/download/osa/cat/osa_cat-41.0.tar.gz
&&
\
tar
xvzf osa_cat-41.0.tar.gz
&&
\
...
...
Makefile
View file @
5ace5e83
IMAGE
?=
integralsw/osa:11.0
OSA_VERSION
?=
$(
shell
curl https://www.isdc.unige.ch/~savchenk/gitlab-ci/savchenk/osa-build-tarball/CentOS_7.5.1804_x86_64/latest/latest/osa-version-ref.txt
)
IMAGE
?=
integralsw/osa:
${OSA_VERSION}
IMAGE_LATEST
?=
integralsw/osa:latest
push
:
build
...
...
@@ -6,8 +8,8 @@ push: build
docker push
$(IMAGE_LATEST)
build
:
Dockerfile
docker build
.
-t
$(IMAGE)
docker build
.
-t
$(IMAGE_LATEST)
docker build
--build-arg
OSA_VERSION
=
${OSA_VERSION}
.
-t
$(IMAGE)
docker build
--build-arg
OSA_VERSION
=
${OSA_VERSION}
.
-t
$(IMAGE_LATEST)
pull
:
docker pull
$(IMAGE)
...
...
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