use docker-compose.yml instead of docker-compose.test.yml
This commit is contained in:
parent
0d8e719675
commit
5e0b0a608b
@ -14,14 +14,14 @@ services:
|
||||
- docker
|
||||
|
||||
install:
|
||||
- docker-compose -f docker-compose.test.yml pull --parallel
|
||||
- docker-compose -f docker-compose.test.yml build
|
||||
- docker-compose pull --parallel
|
||||
- docker-compose build
|
||||
|
||||
script:
|
||||
- docker-compose -f docker-compose.test.yml run app
|
||||
- docker-compose run netbox ./manage.py test
|
||||
|
||||
after_script:
|
||||
- docker-compose -f docker-compose.test.yml down
|
||||
- docker-compose down
|
||||
|
||||
after_success:
|
||||
- docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
|
||||
|
@ -306,10 +306,10 @@ You can use the following ENV variables to customize the build:
|
||||
|
||||
## Tests
|
||||
|
||||
To run the test coming with NetBox, use the `docker-compose.test.yml` file as such:
|
||||
To run the test coming with NetBox, use the `docker-compose.yml` file as such:
|
||||
|
||||
```
|
||||
$ docker-compose -f docker-compose.test.yml run --rm app
|
||||
$ docker-compose run netbox ./manage.py test
|
||||
```
|
||||
|
||||
## About
|
||||
|
@ -1,26 +0,0 @@
|
||||
version: '3'
|
||||
services:
|
||||
app:
|
||||
build:
|
||||
context: .
|
||||
args:
|
||||
- BRANCH=${BRANCH-master}
|
||||
image: ninech/netbox:${BRANCH-latest}
|
||||
depends_on:
|
||||
- postgres
|
||||
env_file: netbox.env
|
||||
volumes:
|
||||
- ./startup_scripts:/opt/netbox/startup_scripts:ro
|
||||
- ./initializers:/opt/netbox/initializers:ro
|
||||
- ./configuration:/etc/netbox/config:ro
|
||||
command:
|
||||
- ./manage.py
|
||||
- test
|
||||
postgres:
|
||||
image: postgres:10.2-alpine
|
||||
env_file: postgres.env
|
||||
volumes:
|
||||
netbox-static-files:
|
||||
driver: local
|
||||
netbox-nginx-config:
|
||||
driver: local
|
Loading…
Reference in New Issue
Block a user