Merge branch 'develop'
testing/ogcore-api/pipeline/head This commit looks good
Details
testing/ogcore-api/pipeline/head This commit looks good
Details
commit
d06f29eda6
|
@ -15,9 +15,6 @@ services:
|
||||||
- ogcore-network
|
- ogcore-network
|
||||||
nginx:
|
nginx:
|
||||||
container_name: ogcore-nginx
|
container_name: ogcore-nginx
|
||||||
build:
|
|
||||||
context: .
|
|
||||||
dockerfile: ./docker/Dockerfile-nginx
|
|
||||||
depends_on:
|
depends_on:
|
||||||
- php
|
- php
|
||||||
ports:
|
ports:
|
||||||
|
@ -31,9 +28,6 @@ services:
|
||||||
|
|
||||||
php:
|
php:
|
||||||
container_name: ogcore-php
|
container_name: ogcore-php
|
||||||
build:
|
|
||||||
context: .
|
|
||||||
dockerfile: ./docker/Dockerfile-jenkins-php
|
|
||||||
depends_on:
|
depends_on:
|
||||||
- database
|
- database
|
||||||
volumes:
|
volumes:
|
||||||
|
|
Loading…
Reference in New Issue