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
26c09fd8
Verified
Commit
26c09fd8
authored
Dec 19, 2018
by
Volodymyr SAVCHENKO
Browse files
build from integral location, and catalog version
parent
de2f8d5b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
9 deletions
+12
-9
Dockerfile
Dockerfile
+8
-6
Makefile
Makefile
+3
-2
init.sh
init.sh
+1
-1
No files found.
Dockerfile
View file @
26c09fd8
...
...
@@ -40,24 +40,26 @@ RUN cd /opt && \
ARG
OSA_VERSION
RUN
cd
/opt
&&
\
RUN
cd
/opt
/
&&
\
if
[
${
OSA_VERSION
}
==
"10.2"
]
;
then
\
wget https://www.isdc.unige.ch/integral/download/osa/sw/10.2/osa10.2-bin-linux64.tar.gz
&&
\
tar
xvzf osa10.2-bin-linux64.tar.gz
&&
\
rm
-fv
osa10.2-bin-linux64.tar.gz
&&
\
mv
osa10.2 osa
;
\
else
\
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
&&
\
wget https://www.isdc.unige.ch/~savchenk/gitlab-ci/
integral/build
/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
&&
\
mv
osa11 osa
;
\
fi
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
&&
\
ARG
isdc_ref_cat_version=42.0
RUN
wget https://www.isdc.unige.ch/integral/download/osa/cat/osa_cat-
${
isdc_ref_cat_version
}
.tar.gz
&&
\
tar
xvzf osa_cat-
${
isdc_ref_cat_version
}
.tar.gz
&&
\
mkdir
-pv
/data/
&&
\
mv
osa_cat-
41.0
/cat /data/
&&
\
rm
-rf
osa_cat-
41.0
mv
osa_cat-
${
isdc_ref_cat_version
}
/cat /data/
&&
\
rm
-rf
osa_cat-
${
isdc_ref_cat_version
}
ADD
init.sh /init.sh
Makefile
View file @
26c09fd8
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
)
OSA_VERSION
?=
$(
shell
curl https://www.isdc.unige.ch/~savchenk/gitlab-ci/integral/build/osa-build-tarball/CentOS_7.5.1804_x86_64/latest/latest/osa-version-ref.txt
)
ISDC_REF_CAT_VERSION
?=
42.0
IMAGE
?=
integralsw/osa:
${OSA_VERSION}
IMAGE
?=
integralsw/osa:
${OSA_VERSION}
-refcat-
${ISDC_REF_CAT_VERSION}
IMAGE_LATEST
?=
integralsw/osa:latest
push
:
build
...
...
init.sh
View file @
26c09fd8
...
...
@@ -3,7 +3,7 @@ export HOME=${HOME_OVERRRIDE:-/home/integral}
export
HEADAS
=
/opt/heasoft/x86_64-pc-linux-gnu-libc2.17/
source
$HEADAS
/headas-init.sh
export
ISDC_REF_CAT
=
/data/cat/hec/gnrl_refr_cat_004
1
.fits
export
ISDC_REF_CAT
=
/data/cat/hec/gnrl_refr_cat_004
2
.fits
export
ISDC_OMC_CAT
=
/data/cat/omc/omc_refr_cat_0005.fits
export
REP_BASE_PROD
=
/data
...
...
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