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
ef30dce6
Commit
ef30dce6
authored
Apr 17, 2020
by
Volodymyr SAVCHENKO
Browse files
use centos 7.7 inside
parent
cf5261b4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
14 deletions
+17
-14
Dockerfile
Dockerfile
+11
-10
Makefile
Makefile
+4
-3
init.sh
init.sh
+2
-1
No files found.
Dockerfile
View file @
ef30dce6
FROM
centos
FROM
centos
:7
RUN
yum
-y
install
epel-release
RUN
yum
-y
update
...
...
@@ -38,7 +38,8 @@ RUN cd /opt && \
# OSA
ARG
OSA_VERSION
ARG
OSA_VERSION=11.1-3-g87cee807-20200410-144247
ARG
OSA_PLATFORM=CentOS_7.7.1908_x86_64
RUN
cd
/opt/
&&
\
if
[
${
OSA_VERSION
}
==
"10.2"
]
;
then
\
...
...
@@ -47,9 +48,9 @@ RUN cd /opt/ && \
rm
-fv
osa10.2-bin-linux64.tar.gz
&&
\
mv
osa10.2 osa
;
\
else
\
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
&&
\
wget https://www.isdc.unige.ch/~savchenk/gitlab-ci/integral/build/osa-build-binary-tarball/
${
OSA_PLATFORM
}
/
${
OSA_VERSION
}
/build-latest/osa-
${
OSA_VERSION
}
-
${
OSA_PLATFORM
}
.tar.gz
&&
\
tar
xvzf osa-
${
OSA_VERSION
}
-
*
.tar.gz
&&
\
rm
-fv
osa-
${
OSA_VERSION
}
-
*
.tar.gz
&&
\
mv
osa11 osa
;
\
fi
...
...
@@ -61,11 +62,11 @@ RUN wget https://www.isdc.unige.ch/integral/download/osa/cat/osa_cat-${isdc_ref_
mv
osa_cat-
${
isdc_ref_cat_version
}
/cat /data/
&&
\
rm
-rf
osa_cat-
${
isdc_ref_cat_version
}
RUN
wget http://ds9.si.edu/download/centos7/ds9.centos7.8.0.1.tar.gz
&&
\
tar
xvfz ds9.centos7.8.0.1.tar.gz
&&
\
chmod
a+x ds9
&&
\
mv
ds9 /usr/local/bin
&&
\
rm
-f
ds9.centos7.8.0.1.tar.gz
#
RUN wget http://ds9.si.edu/download/centos7/ds9.centos7.8.0.1.tar.gz && \
#
tar xvfz ds9.centos7.8.0.1.tar.gz && \
#
chmod a+x ds9 && \
#
mv ds9 /usr/local/bin && \
#
rm -f ds9.centos7.8.0.1.tar.gz
ADD
init.sh /init.sh
Makefile
View file @
ef30dce6
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
)
OSA_PLATFORM
?=
CentOS_7.7.1908_x86_64
OSA_VERSION
?=
$(
shell
curl https://www.isdc.unige.ch/~savchenk/gitlab-ci/integral/build/osa-build-tarball/
$(OSA_PLATFORM)
/latest/latest/osa-version-ref.txt
)
ISDC_REF_CAT_VERSION
?=
42.0
IMAGE
?=
integralsw/osa:
${OSA_VERSION}
-refcat-
${ISDC_REF_CAT_VERSION}
...
...
@@ -9,8 +10,8 @@ push: build
docker push
$(IMAGE_LATEST)
build
:
Dockerfile
docker build
--build-arg
OSA_VERSION
=
${OSA_VERSION}
.
-t
$(IMAGE)
docker
build
--build-arg
OSA_VERSION
=
${OSA_VERSION}
.
-t
$(IMAGE_LATEST)
docker build
--build-arg
OSA_VERSION
=
${OSA_VERSION}
--build-arg
OSA_PLATFORM
=
$(OSA_PLATFORM)
.
-t
$(IMAGE)
docker
tag
$(IMAGE)
$(IMAGE_LATEST)
pull
:
docker pull
$(IMAGE)
...
...
init.sh
View file @
ef30dce6
export
HOME
=
${
HOME_OVERRRIDE
:-
/home/integral
}
export
HOME
=
${
HOME_OVERRRIDE
:-
/tmp/home
}
mkdir
-pv
$HOME
export
HEADAS
=
/opt/heasoft/x86_64-pc-linux-gnu-libc2.17/
source
$HEADAS
/headas-init.sh
...
...
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