Skip to content

Commit e66ef9f

Browse files
authored
Docker fixes (#1438)
* Silence error from dropdb in cms-test.sh * Don't put docker/ in dockerignore This deletes the wildcard that was causing problems with .dev. It doesn't actually hurt to have these scripts in the Docker image (there's lots of other unnecessary files there anyways). * fix codecov directory path in docker-compose file
1 parent 610aa2c commit e66ef9f

File tree

3 files changed

+2
-4
lines changed

3 files changed

+2
-4
lines changed

.dockerignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
.dockerignore
22
Dockerfile
3-
docker/
4-
!docker/_cms-*
53
.vagrant/
64
codecov/
75
.dev/

docker/_cms-test-internal.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
sudo chown cmsuser:cmsuser ./codecov
44

5-
dropdb --host=testdb --username=postgres cmsdbfortesting
5+
dropdb --if-exists --host=testdb --username=postgres cmsdbfortesting
66
createdb --host=testdb --username=postgres cmsdbfortesting
77
cmsInitDB
88

docker/docker-compose.test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ services:
1515
# - https://github.com/actions/runner/issues/241
1616
PYTEST_ADDOPTS: --color=yes
1717
volumes:
18-
- "./codecov:/home/cmsuser/src/codecov"
18+
- "../codecov:/home/cmsuser/src/codecov"
1919
privileged: true
2020
cgroup: host
2121
command: wait-for-it testdb:5432 -- docker/_cms-test-internal.sh

0 commit comments

Comments
 (0)