Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
Tango Images
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
LOFAR2.0
Tango Images
Commits
558055d1
You need to sign in or sign up before continuing.
Commit
558055d1
authored
5 years ago
by
Matteo Di Carlo
Browse files
Options
Downloads
Patches
Plain Diff
tar in nexus
parent
18cdb848
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
docker/tango/tango-cpp/Dockerfile
+1
-1
1 addition, 1 deletion
docker/tango/tango-cpp/Dockerfile
docker/tango/tango-db/Dockerfile
+1
-1
1 addition, 1 deletion
docker/tango/tango-db/Dockerfile
docker/tango/tango-java/Dockerfile
+1
-1
1 addition, 1 deletion
docker/tango/tango-java/Dockerfile
with
3 additions
and
3 deletions
docker/tango/tango-cpp/Dockerfile
+
1
−
1
View file @
558055d1
...
@@ -7,7 +7,7 @@ ARG DOCKER_REGISTRY_USER
...
@@ -7,7 +7,7 @@ ARG DOCKER_REGISTRY_USER
ARG
DOCKER_REGISTRY_HOST
ARG
DOCKER_REGISTRY_HOST
FROM
${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-dependencies:latest
as
buildenv
FROM
${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-dependencies:latest
as
buildenv
RUN
TANGO_DOWNLOAD_URL
=
https://
github.com/tango-controls/TangoSourceDistribution/releases/download/9.3.3-rc2
/tango-9.3.3-rc2.tar.gz
\
RUN
TANGO_DOWNLOAD_URL
=
https://
nexus.engageska-portugal.pt/repository/raw/tango-cs
/tango-9.3.3-rc2.tar.gz
\
# Speed up image builds by adding apt proxy if detected on host
# Speed up image builds by adding apt proxy if detected on host
&& DOCKERHOST=`awk '/^[a-z]+[0-9]+\t00000000/ { printf("%d.%d.%d.%d", "0x" substr($3, 7, 2), "0x" substr($3, 5, 2), "0x" substr($3, 3, 2), "0x" substr($3, 1, 2)) }' < /proc/net/route` \
&& DOCKERHOST=`awk '/^[a-z]+[0-9]+\t00000000/ { printf("%d.%d.%d.%d", "0x" substr($3, 7, 2), "0x" substr($3, 5, 2), "0x" substr($3, 3, 2), "0x" substr($3, 1, 2)) }' < /proc/net/route` \
&& /usr/local/bin/wait-for-it.sh --host=$DOCKERHOST --port=3142 --timeout=3 --strict --quiet -- echo "Acquire::http::Proxy \"http://$DOCKERHOST:3142\";" > /etc/apt/apt.conf.d/30proxy \
&& /usr/local/bin/wait-for-it.sh --host=$DOCKERHOST --port=3142 --timeout=3 --strict --quiet -- echo "Acquire::http::Proxy \"http://$DOCKERHOST:3142\";" > /etc/apt/apt.conf.d/30proxy \
...
...
This diff is collapsed.
Click to expand it.
docker/tango/tango-db/Dockerfile
+
1
−
1
View file @
558055d1
FROM
mariadb:10
FROM
mariadb:10
ENV
TANGO_DOWNLOAD_URL=https://
github.com/tango-controls/TangoSourceDistribution/releases/download/9.3.3-rc2
/tango-9.3.3-rc2.tar.gz
ENV
TANGO_DOWNLOAD_URL=https://
nexus.engageska-portugal.pt/repository/raw/tango-cs
/tango-9.3.3-rc2.tar.gz
RUN
buildDeps
=
'curl ca-certificates'
\
RUN
buildDeps
=
'curl ca-certificates'
\
&&
DEBIAN_FRONTEND
=
noninteractive apt-get update
\
&&
DEBIAN_FRONTEND
=
noninteractive apt-get update
\
...
...
This diff is collapsed.
Click to expand it.
docker/tango/tango-java/Dockerfile
+
1
−
1
View file @
558055d1
...
@@ -19,7 +19,7 @@ RUN JAVA_DOWNLOAD_URL=https://nexus.engageska-portugal.pt/repository/raw/java/jr
...
@@ -19,7 +19,7 @@ RUN JAVA_DOWNLOAD_URL=https://nexus.engageska-portugal.pt/repository/raw/java/jr
&&
update-alternatives
--set
java /usr/java/jre1.8.0_221/bin/java
\
&&
update-alternatives
--set
java /usr/java/jre1.8.0_221/bin/java
\
&&
rm
/usr/java/java.tar.gz
&&
rm
/usr/java/java.tar.gz
RUN
TANGO_DOWNLOAD_URL
=
https://
github.com/tango-controls/TangoSourceDistribution/releases/download/9.3.3-rc2
/tango-9.3.3-rc2.tar.gz
\
RUN
TANGO_DOWNLOAD_URL
=
https://
nexus.engageska-portugal.pt/repository/raw/tango-cs
/tango-9.3.3-rc2.tar.gz
\
&&
DOCKERHOST
=
`
awk
'/^[a-z]+[0-9]+\t00000000/ { printf("%d.%d.%d.%d", "0x" substr($3, 7, 2), "0x" substr($3, 5, 2), "0x" substr($3, 3, 2), "0x" substr($3, 1, 2)) }'
< /proc/net/route
`
\
&&
DOCKERHOST
=
`
awk
'/^[a-z]+[0-9]+\t00000000/ { printf("%d.%d.%d.%d", "0x" substr($3, 7, 2), "0x" substr($3, 5, 2), "0x" substr($3, 3, 2), "0x" substr($3, 1, 2)) }'
< /proc/net/route
`
\
&&
/usr/local/bin/wait-for-it.sh
--host
=
$DOCKERHOST
--port
=
3142
--timeout
=
3
--strict
--quiet
--
echo
"Acquire::http::Proxy
\"
http://
$DOCKERHOST
:3142
\"
;"
>
/etc/apt/apt.conf.d/30proxy
\
&&
/usr/local/bin/wait-for-it.sh
--host
=
$DOCKERHOST
--port
=
3142
--timeout
=
3
--strict
--quiet
--
echo
"Acquire::http::Proxy
\"
http://
$DOCKERHOST
:3142
\"
;"
>
/etc/apt/apt.conf.d/30proxy
\
&&
echo
"Proxy detected on docker host - using for this build"
||
echo
"No proxy detected on docker host"
\
&&
echo
"Proxy detected on docker host - using for this build"
||
echo
"No proxy detected on docker host"
\
...
...
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