Skip to content
Snippets Groups Projects
Commit 3825de5e authored by Florian Spreckelsen's avatar Florian Spreckelsen
Browse files

FIX: Make container names compatible to docker v2

parent fa50b5b6
No related branches found
No related tags found
No related merge requests found
Pipeline #33356 passed
...@@ -180,17 +180,17 @@ test: ...@@ -180,17 +180,17 @@ test:
# here the server and the mysql backend docker are being started # here the server and the mysql backend docker are being started
- CAOSDB_TAG=$CAOSDB_TAG docker-compose up -d - CAOSDB_TAG=$CAOSDB_TAG docker-compose up -d
# store versions of CaosDB parts # store versions of CaosDB parts
- docker exec -u 0 -t docker_caosdb-server_1 cat /opt/caosdb/git/caosdb_server_commit | tee hash_server - docker exec -u 0 -t docker-caosdb-server-1 cat /opt/caosdb/git/caosdb_server_commit | tee hash_server
- docker exec -u 0 -t docker_caosdb-server_1 cat /opt/caosdb/git/caosdb_mysqlbackend_commit | tee hash_mysql - docker exec -u 0 -t docker-caosdb-server-1 cat /opt/caosdb/git/caosdb_mysqlbackend_commit | tee hash_mysql
- docker exec -u 0 -t docker_caosdb-server_1 cat /opt/caosdb/git/caosdb_proto_commit | tee hash_proto - docker exec -u 0 -t docker-caosdb-server-1 cat /opt/caosdb/git/caosdb_proto_commit | tee hash_proto
# the Julia integration test docker writes the return value of the # the Julia integration test docker writes the return value of the
# tests into the file result # tests into the file result
- F_BRANCH=$F_BRANCH /bin/sh ./run.sh - F_BRANCH=$F_BRANCH /bin/sh ./run.sh
# collect log files # collect log files
- docker logs docker_caosdb-server_1 &> ../caosdb_log.txt - docker logs docker-caosdb-server-1 &> ../caosdb_log.txt
- docker logs docker_sqldb_1 &> ../mariadb_log.txt - docker logs docker-sqldb-1 &> ../mariadb_log.txt
# shut down the CaosDB server # shut down the CaosDB server
- CAOSDB_TAG=$CAOSDB_TAG docker-compose -f docker-compose.yml down || true - CAOSDB_TAG=$CAOSDB_TAG docker-compose -f docker-compose.yml down || true
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment