Skip to content
GitLab
Explore
Sign in
Register
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
1f2b26ef
Commit
1f2b26ef
authored
3 years ago
by
Thomas Juerges
Browse files
Options
Downloads
Patches
Plain Diff
L2SS-218
Following Jan David's advice to just use sub-shells instead of pushd/popd
parent
a9202168
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!33
Resolve L2SS-218 "Move existing tooling to bootstrap dir"
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
bootstrap/sbin/rebuild_system_from_scratch.sh
+10
-17
10 additions, 17 deletions
bootstrap/sbin/rebuild_system_from_scratch.sh
with
10 additions
and
17 deletions
bootstrap/sbin/rebuild_system_from_scratch.sh
+
10
−
17
View file @
1f2b26ef
...
...
@@ -15,14 +15,12 @@ trap ' exit ${?} ' ABRT EXIT HUP INT TERM QUIT ERR
function
pull_images
()
{
pushd
${
HOME_DIR
}
/docker-compose
&&
make pull
popd
(
cd
${
HOME_DIR
}
/docker-compose
&&
make pull
)
}
function
build_lofar_images
()
{
pushd
${
HOME_DIR
}
/docker-compose
&&
make build
popd
(
cd
${
HOME_DIR
}
/docker-compose
&&
make build
)
}
function
move_tango_dir_out_of_the_way
()
...
...
@@ -48,23 +46,21 @@ function clean_images()
# has already been shut down.
# Therefore disable Bash's exit on error flag
set
+e
pushd
${
HOME_DIR
}
/docker-compose
&&
make clean
popd
(
cd
${
HOME_DIR
}
/docker-compose
&&
make clean
)
# And enable it again.
set
-e
}
function
start_minimal_tango
()
{
push
d
${
HOME_DIR
}
/docker-compose
(
c
d
${
HOME_DIR
}
/docker-compose
make minimal
make start dsconfig
# Just for good measure, wait a moment and start dsconfig again
echo
-e
"
\t
Waiting for dsconfig to settle down..."
sleep
10
echo
-e
"
\t
Done.
\n\t
Starting dsconfig again."
make start dsconfig
popd
make start dsconfig
)
}
function
configure_tango_db
()
...
...
@@ -77,23 +73,20 @@ function configure_tango_db()
function
configure_elk
()
{
pushd
${
HOME_DIR
}
/docker-compose
&&
make start elk-configure-host
popd
(
cd
${
HOME_DIR
}
/docker-compose
&&
make start elk-configure-host
)
}
function
start_support_images
()
{
pushd
${
HOME_DIR
}
/docker-compose
&&
make start elk
make start jupyter
popd
(
cd
${
HOME_DIR
}
/docker-compose
&&
make start elk
make start jupyter
)
}
function
start_lofar_images
()
{
push
d
${
HOME_DIR
}
/docker-compose
(
c
d
${
HOME_DIR
}
/docker-compose
make start device-pcc
make start device-sdp
popd
make start device-sdp
)
}
...
...
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