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

FIX: Make pipeline docker-v2 compatible

parent 8f3ee05c
No related branches found
No related tags found
No related merge requests found
Pipeline #30908 failed
...@@ -159,11 +159,11 @@ test: ...@@ -159,11 +159,11 @@ test:
- 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_pylib_commit > hash_pylib - docker exec -u 0 -t docker-caosdb-server-1 cat /opt/caosdb/git/caosdb_pylib_commit > hash_pylib
- docker exec -u 0 -t docker_caosdb-server_1 cat /opt/caosdb/git/caosdb_webui_commit > hash_webui - docker exec -u 0 -t docker-caosdb-server-1 cat /opt/caosdb/git/caosdb_webui_commit > hash_webui
- docker exec -u 0 -t docker_caosdb-server_1 cat /opt/caosdb/git/caosdb_server_commit > hash_server - docker exec -u 0 -t docker-caosdb-server-1 cat /opt/caosdb/git/caosdb_server_commit > hash_server
- docker exec -u 0 -t docker_caosdb-server_1 cat /opt/caosdb/git/caosdb_mysqlbackend_commit > hash_mysql - docker exec -u 0 -t docker-caosdb-server-1 cat /opt/caosdb/git/caosdb_mysqlbackend_commit > hash_mysql
- docker exec -u 0 -t docker_caosdb-server_1 cat /opt/caosdb/git/caosdb_proto_commit > hash_proto - docker exec -u 0 -t docker-caosdb-server-1 cat /opt/caosdb/git/caosdb_proto_commit > hash_proto
- cat hash_server - cat hash_server
- cat hash_proto - cat hash_proto
- cat hash_mysql - cat hash_mysql
...@@ -175,8 +175,8 @@ test: ...@@ -175,8 +175,8 @@ test:
- /bin/sh ./run.sh - /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 # shut down
- CAOSDB_TAG=$CAOSDB_TAG docker-compose -f docker-compose.yml down - CAOSDB_TAG=$CAOSDB_TAG docker-compose -f docker-compose.yml down
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment