Commit 14dacea4 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Docker : ajustements pour pouvoir construire une image de démo

parent 13396154
Loading
Loading
Loading
Loading
+13 −15
Original line number Diff line number Diff line
nbproject
._*
.~lock.*
.buildpath
/config/autoload/*local*.php

/data/db/
/data/cache/
/data/DoctrineModule/
/data/DoctrineORMModule/
/vendor

/tmp/

.DS_Store
.idea
.project
.settings
vendor/
public/vendor/
config/development.config.php
config/autoload/local.php
config/autoload/*.local.php
!public/vendor/README.md
data/cache/*
!data/cache/.gitkeep
.idea/
.~*
.sass-cache/
+5 −1
Original line number Diff line number Diff line

ARG PHP_VERSION

FROM unicaen-dev-php${PHP_VERSION}-apache
FROM registre.unicaen.fr:5000/unicaen-dev-php${PHP_VERSION}-apache

LABEL maintainer="Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>"

@@ -19,3 +19,7 @@ ADD docker/fpm/conf.d/app.ini ${PHP_CONF_DIR}/fpm/conf.d/

RUN a2ensite app app-ssl && \
    service php${PHP_VERSION}-fpm reload

COPY . /app

WORKDIR /app
+8 −1
Original line number Diff line number Diff line
@@ -2,12 +2,19 @@ version: "2"

services:
  sygal-import-ws:
    image: sygal-import-ws-image-php7.0
#    image: sygal-import-ws-image-php7.0
    build:
      context: .
      args:
        - PHP_VERSION=7.0
    container_name: sygal-import-ws-container-php7.0
    environment:
      - http_proxy
      - https_proxy
      - no_proxy
      - HTTP_PROXY
      - HTTPS_PROXY
      - NO_PROXY
    ports:
      - "8443:443"
    volumes: