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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
LOFAR2.0
tango
Commits
83eb9399
Commit
83eb9399
authored
3 years ago
by
Jan David Mol
Browse files
Options
Downloads
Patches
Plain Diff
L2SS-367
: Add 'make restart' and remove container on 'make stop'
parent
e5c206d1
No related branches found
No related tags found
1 merge request
!123
L2SS-367: Cleanup containers on 'make clean', enhance 'make build'
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
docker-compose/Makefile
+8
-1
8 additions, 1 deletion
docker-compose/Makefile
with
8 additions
and
1 deletion
docker-compose/Makefile
+
8
−
1
View file @
83eb9399
...
@@ -29,6 +29,8 @@ ifeq (start,$(firstword $(MAKECMDGOALS)))
...
@@ -29,6 +29,8 @@ ifeq (start,$(firstword $(MAKECMDGOALS)))
SERVICE_TARGET
=
true
SERVICE_TARGET
=
true
else
ifeq
(stop,$(firstword $(MAKECMDGOALS)))
else
ifeq
(stop,$(firstword $(MAKECMDGOALS)))
SERVICE_TARGET
=
true
SERVICE_TARGET
=
true
else
ifeq
(restart,$(firstword $(MAKECMDGOALS)))
SERVICE_TARGET
=
true
else
ifeq
(build,$(firstword $(MAKECMDGOALS)))
else
ifeq
(build,$(firstword $(MAKECMDGOALS)))
SERVICE_TARGET
=
true
SERVICE_TARGET
=
true
else
ifeq
(build-nocache,$(firstword $(MAKECMDGOALS)))
else
ifeq
(build-nocache,$(firstword $(MAKECMDGOALS)))
...
@@ -122,7 +124,7 @@ DOCKER_COMPOSE_ARGS := DISPLAY=$(DISPLAY) \
...
@@ -122,7 +124,7 @@ DOCKER_COMPOSE_ARGS := DISPLAY=$(DISPLAY) \
CONTAINER_EXECUTION_UID
=
$(
shell
id
-u
)
CONTAINER_EXECUTION_UID
=
$(
shell
id
-u
)
.PHONY
:
up down minimal start stop status clean pull help
.PHONY
:
up down minimal start stop
restart build build-nocache
status clean pull help
.DEFAULT_GOAL
:=
help
.DEFAULT_GOAL
:=
help
pull
:
##
pull the images from the Docker hub
pull
:
##
pull the images from the Docker hub
...
@@ -161,6 +163,11 @@ start: up ## start a service (usage: make start <servicename>)
...
@@ -161,6 +163,11 @@ start: up ## start a service (usage: make start <servicename>)
stop
:
##
stop a service (usage: make stop <servicename>)
stop
:
##
stop a service (usage: make stop <servicename>)
$(
DOCKER_COMPOSE_ARGS
)
docker-compose
$(
COMPOSE_FILE_ARGS
)
stop
$(
SERVICE
)
$(
DOCKER_COMPOSE_ARGS
)
docker-compose
$(
COMPOSE_FILE_ARGS
)
stop
$(
SERVICE
)
$(
DOCKER_COMPOSE_ARGS
)
docker-compose
$(
COMPOSE_FILE_ARGS
)
rm
-f
$(
SERVICE
)
restart
:
##
restart a service (usage: make restart <servicename>)
make stop
$(
SERVICE
)
# cannot use dependencies, as that would allow start and stop to run in parallel..
make start
$(
SERVICE
)
attach
:
##
attach a service to an existing Tango network
attach
:
##
attach a service to an existing Tango network
$(
DOCKER_COMPOSE_ARGS
)
docker-compose
$(
ATTACH_COMPOSE_FILE_ARGS
)
up
-d
$(
SERVICE
)
$(
DOCKER_COMPOSE_ARGS
)
docker-compose
$(
ATTACH_COMPOSE_FILE_ARGS
)
up
-d
$(
SERVICE
)
...
...
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