aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArthur She <arthur.she@linaro.org>2021-06-16 03:59:17 +0000
committerArthur She <arthur.she@linaro.org>2021-06-16 03:59:17 +0000
commit96947b0d92190fc64abee0e6ba68ea7a52636ec0 (patch)
tree4fb41d92c9088beb8c554efdf66d9992d380ca05
parentbdd3de4a1eed8b71569c99a520af891145ff2c79 (diff)
docker-compose.yamlHEADmaster
Using bind mount instead of named voulme on /var/lib/lava/dispatcher/tmp to solve FVP docker container start up issue. Signed-off-by: Arthur She <arthur.she@linaro.org>
-rw-r--r--Makefile4
-rw-r--r--docker-compose.yaml10
2 files changed, 7 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index e3eb526..c857ab4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
all:
docker-compose pull
- docker-compose build
- docker-compose up
+ docker-compose build --no-cache --force-rm
+ docker-compose up -d
lava-server:
docker-compose build lava-server
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 394115c..f21663e 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -118,7 +118,7 @@ services:
- '/dev/serial:/dev/serial:ro' # required for serial adapters
- '/dev/disk:/dev/disk:ro' # required for SDMux
- worker-state:/var/lib/lava/dispatcher/worker/
- - worker-http:/var/lib/lava/dispatcher/tmp
+ - /var/lib/lava/dispatcher/tmp:/var/lib/lava/dispatcher/tmp
- worker-tftp:/srv/tftp
- /home/arthur/tools/stm/STMicroelectronics/STM32Cube/STM32CubeProgrammer:/usr/local/bin/STM32CubeProgrammer
@@ -126,7 +126,7 @@ services:
image: httpd
volumes:
- ./httpd/httpd.conf:/usr/local/apache2/conf/httpd.conf:ro
- - worker-http:/var/lib/lava/dispatcher/tmp
+ - /var/lib/lava/dispatcher/tmp:/var/lib/lava/dispatcher/tmp
ports:
- 80
@@ -166,7 +166,7 @@ services:
ftp_proxy: "${ftp_proxy}"
privileged: true
volumes:
- - worker-http:/var/lib/lava/dispatcher/tmp
+ - /var/lib/lava/dispatcher/tmp:/var/lib/lava/dispatcher/tmp
ports:
- 111:111
- 111:111/udp
@@ -189,7 +189,7 @@ volumes:
name: lava-server-joboutput
worker-state:
name: lava-server-worker-state
- worker-http:
- name: lava-server-worker-http
+# worker-http:
+# name: lava-server-worker-http
worker-tftp:
name: lava-server-worker-tftp