Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
tango
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Jira issues
Open 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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
LOFAR2.0
tango
Commits
cc8f5b6c
Commit
cc8f5b6c
authored
2 years ago
by
Corné Lukken
Browse files
Options
Downloads
Plain Diff
Merge branch 'update-hdbpp-branches' into 'master'
L2SS-1001
: Do not point to specific branches Closes
L2SS-1001
See merge request
!446
parents
f4a9e0c0
d420452f
No related branches found
No related tags found
1 merge request
!446
L2SS-1001: Do not point to specific branches
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
docker-compose/hdbpp/Dockerfile
+2
-2
2 additions, 2 deletions
docker-compose/hdbpp/Dockerfile
docker-compose/hdbppts-cm/Dockerfile
+2
-2
2 additions, 2 deletions
docker-compose/hdbppts-cm/Dockerfile
docker-compose/hdbppts-es/Dockerfile
+2
-2
2 additions, 2 deletions
docker-compose/hdbppts-es/Dockerfile
with
6 additions
and
6 deletions
docker-compose/hdbpp/Dockerfile
+
2
−
2
View file @
cc8f5b6c
...
@@ -31,7 +31,7 @@ RUN echo "deb http://deb.debian.org/debian buster-backports main contrib non-fre
...
@@ -31,7 +31,7 @@ RUN echo "deb http://deb.debian.org/debian buster-backports main contrib non-fre
# ----------- LIBHDB++ -----------------------------
# ----------- LIBHDB++ -----------------------------
RUN
git clone
-b
master
https://gitlab.com/tango-controls/hdbpp/libhdbpp.git
RUN
git clone https://gitlab.com/tango-controls/hdbpp/libhdbpp.git
RUN
cd
libhdbpp
\
RUN
cd
libhdbpp
\
&&
mkdir
build
\
&&
mkdir
build
\
...
@@ -46,7 +46,7 @@ RUN cd libhdbpp/build \
...
@@ -46,7 +46,7 @@ RUN cd libhdbpp/build \
--showinstall
=
no
\
--showinstall
=
no
\
--backup
=
no
\
--backup
=
no
\
--type
=
debian
\
--type
=
debian
\
--pkgsource
=
"https://git
hu
b.com/tango-controls
-
hdbpp/libhdbpp"
\
--pkgsource
=
"https://git
la
b.com/tango-controls
/
hdbpp/libhdbpp"
\
--pkglicense
=
"LGPLv3"
\
--pkglicense
=
"LGPLv3"
\
--deldesc
=
no
\
--deldesc
=
no
\
--nodoc
\
--nodoc
\
...
...
This diff is collapsed.
Click to expand it.
docker-compose/hdbppts-cm/Dockerfile
+
2
−
2
View file @
cc8f5b6c
...
@@ -3,7 +3,7 @@ FROM ${SOURCE_IMAGE}
...
@@ -3,7 +3,7 @@ FROM ${SOURCE_IMAGE}
# ----------- HDB++ CONFIGURATION MANAGER ---------------
# ----------- HDB++ CONFIGURATION MANAGER ---------------
RUN
git clone
-b
master
https://git
hu
b.com/tango-controls
-
hdbpp/hdbpp-cm.git
RUN
git clone https://git
la
b.com/tango-controls
/
hdbpp/hdbpp-cm.git
RUN
cd
hdbpp-cm
\
RUN
cd
hdbpp-cm
\
&&
mkdir
-p
build
\
&&
mkdir
-p
build
\
...
@@ -18,7 +18,7 @@ RUN cd hdbpp-cm/build \
...
@@ -18,7 +18,7 @@ RUN cd hdbpp-cm/build \
--showinstall
=
no
\
--showinstall
=
no
\
--backup
=
no
\
--backup
=
no
\
--type
=
debian
\
--type
=
debian
\
--pkgsource
=
"https://git
hu
b.com/tango-controls
-
hdbpp/hdbpp-cm"
\
--pkgsource
=
"https://git
la
b.com/tango-controls
/
hdbpp/hdbpp-cm"
\
--pkglicense
=
"GPLv3"
\
--pkglicense
=
"GPLv3"
\
--deldesc
=
no
\
--deldesc
=
no
\
--nodoc
\
--nodoc
\
...
...
This diff is collapsed.
Click to expand it.
docker-compose/hdbppts-es/Dockerfile
+
2
−
2
View file @
cc8f5b6c
...
@@ -3,7 +3,7 @@ FROM ${SOURCE_IMAGE}
...
@@ -3,7 +3,7 @@ FROM ${SOURCE_IMAGE}
# ----------- HDB++ EVENT SUBSCRIBER ---------------
# ----------- HDB++ EVENT SUBSCRIBER ---------------
RUN
git clone
-b
master
https://git
hu
b.com/tango-controls
-
hdbpp/hdbpp-es.git
RUN
git clone https://git
la
b.com/tango-controls
/
hdbpp/hdbpp-es.git
RUN
cd
hdbpp-es
\
RUN
cd
hdbpp-es
\
&&
mkdir
-p
build
\
&&
mkdir
-p
build
\
...
@@ -18,7 +18,7 @@ RUN cd hdbpp-es/build \
...
@@ -18,7 +18,7 @@ RUN cd hdbpp-es/build \
--showinstall
=
no
\
--showinstall
=
no
\
--backup
=
no
\
--backup
=
no
\
--type
=
debian
\
--type
=
debian
\
--pkgsource
=
"https://git
hu
b.com/tango-controls
-
hdbpp/hdbpp-es"
\
--pkgsource
=
"https://git
la
b.com/tango-controls
/
hdbpp/hdbpp-es"
\
--pkglicense
=
"GPLv3"
\
--pkglicense
=
"GPLv3"
\
--deldesc
=
no
\
--deldesc
=
no
\
--nodoc
\
--nodoc
\
...
...
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