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
5250e005
Commit
5250e005
authored
3 years ago
by
Jan David Mol
Browse files
Options
Downloads
Plain Diff
Merge branch '
L2SS-792
' into 'master'
L2SS-792
: Fix not being able to connect to database See merge request
!338
parents
ed30a0ef
b2036e85
No related branches found
No related tags found
1 merge request
!338
L2SS-792: Fix not being able to connect to database
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
docker-compose/Makefile
+4
-4
4 additions, 4 deletions
docker-compose/Makefile
with
4 additions
and
4 deletions
docker-compose/Makefile
+
4
−
4
View file @
5250e005
...
@@ -106,7 +106,7 @@ else
...
@@ -106,7 +106,7 @@ else
endif
endif
#
#
# When
r
unning in network=host mode, point devices at a port on the host
# When
u
unning in network=host mode, point devices at a port on the host
# machine rather than at the container.
# machine rather than at the container.
#
#
ifeq
($(NETWORK_MODE),host)
ifeq
($(NETWORK_MODE),host)
...
@@ -160,7 +160,7 @@ up: minimal ## start the base TANGO system and prepare requested services
...
@@ -160,7 +160,7 @@ up: minimal ## start the base TANGO system and prepare requested services
$(
DOCKER_COMPOSE_ARGS
)
docker-compose
$(
COMPOSE_FILE_ARGS
)
up
--no-start
--no-recreate
$(
SERVICE
)
$(
DOCKER_COMPOSE_ARGS
)
docker-compose
$(
COMPOSE_FILE_ARGS
)
up
--no-start
--no-recreate
$(
SERVICE
)
run
:
minimal
##
run a service using arguments and delete it afterwards
run
:
minimal
##
run a service using arguments and delete it afterwards
$(
DOCKER_COMPOSE_ARGS
)
docker-compose
$(
COMPOSE_FILE_ARGS
)
run
--rm
$(
SERVICE
)
$(
SERVICE_ARGS
)
$(
DOCKER_COMPOSE_ARGS
)
docker-compose
$(
COMPOSE_FILE_ARGS
)
run
--no-deps
--rm
$(
SERVICE
)
$(
SERVICE_ARGS
)
down
:
##
stop all services and tear down the system
down
:
##
stop all services and tear down the system
$(
DOCKER_COMPOSE_ARGS
)
docker-compose
$(
COMPOSE_FILE_ARGS
)
down
$(
DOCKER_COMPOSE_ARGS
)
docker-compose
$(
COMPOSE_FILE_ARGS
)
down
...
@@ -174,7 +174,7 @@ ifneq ($(NETWORK_MODE),host)
...
@@ -174,7 +174,7 @@ ifneq ($(NETWORK_MODE),host)
docker network inspect
$(
NETWORK_MODE
)
&> /dev/null
||
([
$$
?
-ne
0
]
&&
docker network create
$(
NETWORK_MODE
)
)
docker network inspect
$(
NETWORK_MODE
)
&> /dev/null
||
([
$$
?
-ne
0
]
&&
docker network create
$(
NETWORK_MODE
)
)
docker network inspect 9000-
$(
NETWORK_MODE
)
&> /dev/null
||
([
$$
?
-ne
0
]
&&
docker network create 9000-
$(
NETWORK_MODE
)
-o
com.docker.network.driver.mtu
=
9000
)
docker network inspect 9000-
$(
NETWORK_MODE
)
&> /dev/null
||
([
$$
?
-ne
0
]
&&
docker network create 9000-
$(
NETWORK_MODE
)
-o
com.docker.network.driver.mtu
=
9000
)
endif
endif
$(
DOCKER_COMPOSE_ARGS
)
docker-compose
-f
tango.yml
-f
networks.yml up
-d
$(
DOCKER_COMPOSE_ARGS
)
docker-compose
-f
tango.yml
-f
networks.yml up
--no-recreate
-d
bootstrap
:
pull build
#
first start
,
initialise from scratch
bootstrap
:
pull build
#
first start
,
initialise from scratch
$(
MAKE
)
start elk-configure-host
# configure host kernel for elk container
$(
MAKE
)
start elk-configure-host
# configure host kernel for elk container
...
@@ -197,7 +197,7 @@ restart: ## restart a service (usage: make restart <servicename>)
...
@@ -197,7 +197,7 @@ restart: ## restart a service (usage: make restart <servicename>)
make start
$(
SERVICE
)
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
--no-recreate
-d
$(
SERVICE
)
status
:
##
show the container status
status
:
##
show the container status
$(
DOCKER_COMPOSE_ARGS
)
docker-compose
$(
COMPOSE_FILE_ARGS
)
ps
$(
DOCKER_COMPOSE_ARGS
)
docker-compose
$(
COMPOSE_FILE_ARGS
)
ps
...
...
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