Skip to content
Snippets Groups Projects
Commit fa1a0c07 authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Merge remote-tracking branch 'origin/master'

parents a4962264 f94398e3
No related branches found
No related tags found
No related merge requests found
......@@ -24,3 +24,6 @@ phpunit.xml
# Metadata PhpStorm
.idea/
# Misc
*htpasswd
\ No newline at end of file
......@@ -23,10 +23,6 @@
#
FROM adrianharabula/php7-with-oci8
ENV http_proxy=http://10.14.128.99:3128
ENV https_proxy=http://10.14.128.99:3128
ENV no_proxy=localhost,127.0.0.1,.unicaen.fr
RUN apt-get update \
&& apt-get install -y git zlib1g-dev \
&& docker-php-ext-install zip \
......
version: "2"
services:
apigility:
sygal-import-ws:
build:
context: .
dockerfile: Dockerfile
args:
http_proxy: http://10.14.128.99:3128
https_proxy: http://10.14.128.99:3128
no_proxy: localhost,127.0.0.1,.unicaen.fr
ports:
- "8080:80"
extra_hosts:
- "svn.unicaen.fr:10.14.129.44"
- "proxy.unicaen.fr:10.14.128.99"
- "8080:8080"
volumes:
- .:/var/www
network_mode: bridge
dns: 10.14.128.125
dns_search: unicaen.fr
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment