Commit d6d784be authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Merge branch 'master' of git.unicaen.fr:open-source/sygal

parents fb918d66 8e1f65c3

data/.gitignore

+1 −0
Changes for data/.gitignore: 1 added line, 0 removed lines.
Original line number Diff line number Diff line 
db/

cache/
 
 No newline at end of file

docker-compose.yml

+2 −2
Changes for docker-compose.yml: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ version: '3' 


services:

  sygal:

    image: registre.unicaen.fr:5000/sygal-image-php7.4

    container_name: sygal-container-php7.4

    image: registre.unicaen.fr:5000/sygal-image-php7.3

    container_name: sygal-container-php7.3

    environment:

      - http_proxy

      - https_proxy