@@ -4,14 +4,22 @@ SCRIPT_FILE_PATH=$(readlink -f "${0}")
4
4
SCRIPT_FOLDER=$( dirname " ${SCRIPT_FILE_PATH} " )
5
5
MAIN_FOLDER=" ${SCRIPT_FOLDER} /../lms"
6
6
7
- docker exec -i lms-rabbitmq-1 rabbitmqctl add_vhost lmstests-public
8
- docker exec -i lms-rabbitmq-1 rabbitmqctl add_vhost lmstests-sandbox
9
- docker exec -i lms-rabbitmq-1 rabbitmqctl set_permissions -p lmstests-public rabbit-user " .*" " .*" " .*"
10
- docker exec -i lms-rabbitmq-1 rabbitmqctl set_permissions -p lmstests-sandbox rabbit-user " .*" " .*" " .*"
11
- docker exec -i lms-http-1 python lmsdb/bootstrap.py
7
+ # Starting from docker-compose 2,
8
+ # names are network-image-id instead of network_image_id
9
+ if docker-compose --version | grep -q ' version 2' ; then
10
+ SEP=" -"
11
+ else
12
+ SEP=" _"
13
+ fi
14
+
15
+ docker exec -i lms${SEP} rabbitmq${SEP} 1 rabbitmqctl add_vhost lmstests-public
16
+ docker exec -i lms${SEP} rabbitmq${SEP} 1 rabbitmqctl add_vhost lmstests-sandbox
17
+ docker exec -i lms${SEP} rabbitmq${SEP} 1 rabbitmqctl set_permissions -p lmstests-public rabbit-user " .*" " .*" " .*"
18
+ docker exec -i lms${SEP} rabbitmq${SEP} 1 rabbitmqctl set_permissions -p lmstests-sandbox rabbit-user " .*" " .*" " .*"
19
+ docker exec -i lms${SEP} http${SEP} 1 python lmsdb/bootstrap.py
12
20
13
21
# build the image for docker inside a docker!
14
- docker exec lms- checks-docker-engine- 1 mkdir -p /home/lms
15
- docker cp " ${MAIN_FOLDER} " /lmstests/public/unittests/image/requirements.txt lms- checks-docker-engine- 1:/home/lms/.
16
- docker cp " ${MAIN_FOLDER} " /lmstests/public/unittests/image/Dockerfile lms- checks-docker-engine- 1:/home/lms/.
17
- docker exec lms- checks-docker-engine-1 sh -c " cd /home/lms && docker build -t lms ."
22
+ docker exec lms${SEP} checks-docker-engine${SEP} 1 mkdir -p /home/lms
23
+ docker cp " ${MAIN_FOLDER} " /lmstests/public/unittests/image/requirements.txt lms${SEP} checks-docker-engine${SEP} 1:/home/lms/.
24
+ docker cp " ${MAIN_FOLDER} " /lmstests/public/unittests/image/Dockerfile lms${SEP} checks-docker-engine${SEP} 1:/home/lms/.
25
+ docker exec lms${SEP} checks-docker-engine${SEP} 1 sh -c " cd /home/lms && docker build -t lms ."
0 commit comments