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

Merge branch 'f-pipeline' into 'dev'

F pipeline

See merge request !49
parents f1f68ae6 721e943a
No related branches found
No related tags found
2 merge requests!54REL: Release 0.5.0,!49F pipeline
Pipeline #25984 passed
# Use docker as parent image # Use docker as parent image
FROM docker:19.03.0 FROM docker:20.10
# http://bugs.python.org/issue19846 # http://bugs.python.org/issue19846
ENV LANG C.UTF-8 ENV LANG C.UTF-8
......
...@@ -58,8 +58,8 @@ test: ...@@ -58,8 +58,8 @@ test:
- cd .docker - cd .docker
- /bin/sh ./run.sh - /bin/sh ./run.sh
- cd .. - cd ..
- 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
- docker-compose -f .docker/docker-compose.yml down - docker-compose -f .docker/docker-compose.yml down
- rc=`cat .docker/result` - rc=`cat .docker/result`
- exit $rc - exit $rc
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment