OS env

.env

@@ -1,3 +1,6 @@
+#OS : MAC ou LINUX
+OS=MAC
+
 #Composer hash for instal (check validity here : https://getcomposer.org/download/)
 COMPOSER_HASH=baf1608c33254d00611ac1705c1d9958c817a1a33bce370c0595974b342601bd80b92a3f46067da89e3b06bff421f182
 

.env.skeleton

@@ -0,0 +1,49 @@
+#OS : MAC ou LINUX
+OS=MAC
+
+#Composer hash for instal (check validity here : https://getcomposer.org/download/)
+COMPOSER_HASH=baf1608c33254d00611ac1705c1d9958c817a1a33bce370c0595974b342601bd80b92a3f46067da89e3b06bff421f182
+
+#LetsEncrypt
+EMAIL=vincent.guffon@2iopenservice.com
+
+#DataBase
+MYSQL_PASS=mysql660
+
+#Elasticsearch
+ES_VIRTUAL_HOST=local.elasticsearch.opentalent.fr
+ES_PORT=9200
+
+#API
+API_VIRTUAL_HOST=local.api.opentalent.fr
+
+#ADMIN
+ADMIN_VIRTUAL_HOST=local.admin.opentalent.fr
+ADMIN_PORT=3000
+ADMIN_REPORT_PORT=3001
+
+#PORTAIL
+PORTAIL_VIRTUAL_HOST=local.opentalent.fr
+
+#V59
+V59_VIRTUAL_HOST=local.v59.opentalent.fr
+
+#PHPMYADMIN
+PHPMYADMIN_VIRTUAL_HOST=local.phpmyadmin.opentalent.fr
+
+#MAILCATCHER
+MAILCATCHER_VIRTUAL_HOST=local.mailcatcher.opentalent.fr
+MAILCATCHER_PORT=1080
+
+#THUMBOR
+THUMBOR_VIRTUAL_HOST=local.thumbor.opentalent.fr
+
+#Black Fire
+BLACK_FIRE_ID=97e9ee98-0703-478e-a298-6320bd432393
+BLACK_FIRE_TOKEN=31c026c1ee937f59834cec4da0d019d946ce3e3dd02119ab621e59d1b52a20e9
+BLACK_FIRE_VIRTUAL_HOST=local.blackfire.opentalent.fr
+BLACK_FIRE_PORT=8707
+
+#Metabase
+METABASE_VIRTUAL_HOST=local.metabase.opentalent.fr
+METABASE_PORT=3000

.gitignore

@@ -8,6 +8,9 @@
 !/apps/.gitkeep
 /.vagrant
 /.ssh/*
+/.env
 !/.ssh/.gitkeep
 !/.ssh/id_rsa_exploitation
-/Vagrantfile
+/docker/.idea
+/docker/nginx/certs/*
+!/docker/nginx/certs/ssl_keys.sh

README

@@ -4,6 +4,11 @@ Docker Compose : https://docs.docker.com/compose/install/
 
 Faire : docker ps
 Si Docker ne marche pas sans "sudo" appliquer : https://techoverflow.net/2017/03/01/solving-docker-permission-denied-while-trying-to-connect-to-the-docker-daemon-socket/
+sudo usermod -aG docker $USER
+
+=========== Fichier .env   ============
+recopier (ne pas le supprimer !!) le fichier .env.skeleton en .env
+adapter le contenu par rapport à votre config...
 
 =========== Générer les contrats SSL   ============
 rendre éxécutable le fichier de génération de clé : chmod +x docker/nginx/certs/ssl_keys.sh

docker-compose.yaml

@@ -74,6 +74,7 @@ services:
       dockerfile: docker/php/Dockerfile
       args:
         - COMPOSER_HASH=${COMPOSER_HASH}
+        - OS=${OS}
     restart: always
     volumes:
       # Version Symfony 2
@@ -150,6 +151,8 @@ services:
     build:
       context: .
       dockerfile: docker/adminassos/Dockerfile
+      args:
+        - OS=${OS}
     restart: always
     volumes:
       - ./apps/opentalent:/var/source/opentalent:rw,cached

docker/adminassos/Dockerfile

@@ -1,11 +1,14 @@
 # ./docker/php/Dockerfile
 FROM php:7.0.33-apache
 
+ARG OS
+
 RUN sed 's/main$/main universe/' -i /etc/apt/sources.list; \
     apt-get update;   \
     ### WKHTMLTOPDF
-    #DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y build-essential xorg iputils-ping libssl-dev libxrender-dev wget gdebi ca-certificates wget xz-utils libxrender1 libxt6 libxtst6 fontconfig zlib1g-dev libpng-dev libicu-dev g++; \
-    apt-get install -y --no-install-recommends build-essential xorg iputils-ping libssl-dev libxrender-dev wget gdebi ca-certificates wget xz-utils libxrender1 libxt6 libxtst6 fontconfig zlib1g-dev libpng-dev libicu-dev g++; \
+    if [ "x$OS" = "MAC" ] ; then apt-get install -y --no-install-recommends build-essential xorg iputils-ping libssl-dev libxrender-dev wget gdebi ca-certificates wget xz-utils libxrender1 libxt6 libxtst6 fontconfig zlib1g-dev libpng-dev libicu-dev g++; \
+    else DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y build-essential xorg iputils-ping libssl-dev libxrender-dev wget gdebi ca-certificates wget xz-utils libxrender1 libxt6 libxtst6 fontconfig zlib1g-dev libpng-dev libicu-dev g++; \
+    fi; \
     wget http://security.debian.org/debian-security/pool/updates/main/o/openssl/libssl1.0.0_1.0.1t-1+deb8u12_amd64.deb; \
     dpkg -i libssl1.0.0_1.0.1t-1+deb8u12_amd64.deb; \
     wget http://ftp.de.debian.org/debian/pool/main/libp/libpng/libpng12-0_1.2.50-2+deb8u3_amd64.deb; \

docker/php/Dockerfile

@@ -2,12 +2,14 @@
 FROM php:7.0.33-fpm
 
 ARG COMPOSER_HASH
+ARG OS
 
 RUN sed 's/main$/main universe/' -i /etc/apt/sources.list; \
     apt-get update; \
     ### WKHTMLTOPDF
-    #DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y build-essential xorg iputils-ping libssl-dev libxrender-dev wget gdebi ca-certificates wget xz-utils libxrender1 libxt6 libxtst6 fontconfig zlib1g-dev libpng-dev libicu-dev g++; \
-    apt-get install -y --no-install-recommends build-essential xorg iputils-ping libssl-dev libxrender-dev wget gdebi ca-certificates wget xz-utils libxrender1 libxt6 libxtst6 fontconfig zlib1g-dev libpng-dev libicu-dev g++; \
+    if [ "x$OS" = "MAC" ] ; then apt-get install -y --no-install-recommends build-essential xorg iputils-ping libssl-dev libxrender-dev wget gdebi ca-certificates wget xz-utils libxrender1 libxt6 libxtst6 fontconfig zlib1g-dev libpng-dev libicu-dev g++; \
+    else DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y build-essential xorg iputils-ping libssl-dev libxrender-dev wget gdebi ca-certificates wget xz-utils libxrender1 libxt6 libxtst6 fontconfig zlib1g-dev libpng-dev libicu-dev g++; \
+    fi; \
     wget http://security.debian.org/debian-security/pool/updates/main/o/openssl/libssl1.0.0_1.0.1t-1+deb8u12_amd64.deb; \
     dpkg -i libssl1.0.0_1.0.1t-1+deb8u12_amd64.deb; \
     wget http://ftp.de.debian.org/debian/pool/main/libp/libpng/libpng12-0_1.2.50-2+deb8u3_amd64.deb; \
@@ -59,7 +61,11 @@ COPY /docker/php/conf/execution_time.ini /usr/local/etc/php/conf.d
 
 WORKDIR /var/www/html
 
-CMD HTTPDUSER=$(ps axo user,comm | grep -E '[a]pache|[h]ttpd|[_]www|[w]ww-data|[n]ginx' | grep -v root | head -1 | cut -d\  -f1); \
+CMD if [ "x$OS" = "MAC" ] ; then HTTPDUSER=$(ps axo user,comm | grep -E '[a]pache|[h]ttpd|[_]www|[w]ww-data|[n]ginx' | grep -v root | head -1 | cut -d\  -f1); \
     setfacl -dR -m u:"$HTTPDUSER":rwX -m u:$(whoami):rwX app/cache app/logs && setfacl -R -m u:"$HTTPDUSER":rwX -m u:$(whoami):rwX app/cache app/logs; \
     chown -R www-data:www-data /var/www/html/web; \
-    php-fpm;
+    php-fpm; \
+    else HTTPDUSER=$(ps axo user,comm | grep -E '[a]pache|[h]ttpd|[_]www|[w]ww-data|[n]ginx' | grep -v root | head -1 | cut -d\  -f1); \
+    setfacl -dR -m u:"$HTTPDUSER":rwX -m u:$(whoami):rwX app/cache app/logs && setfacl -R -m u:"$HTTPDUSER":rwX -m u:$(whoami):rwX app/cache app/logs;\
+    php-fpm; \
+    fi;