Merge branch 'master' into master

docker-compose.yml

@@ -48,6 +48,7 @@ services:
         context: ./workspace
         args:
           - PHP_VERSION=${PHP_VERSION}
+          - INSTALL_SUBVERSION=${WORKSPACE_INSTALL_SUBVERSION}
           - INSTALL_XDEBUG=${WORKSPACE_INSTALL_XDEBUG}
           - INSTALL_BLACKFIRE=${INSTALL_BLACKFIRE}
           - INSTALL_SOAP=${WORKSPACE_INSTALL_SOAP}
@@ -143,6 +144,8 @@ services:
         - "dockerhost:${DOCKER_HOST_IP}"
       environment:
         - PHP_IDE_CONFIG=${PHP_IDE_CONFIG}
+      depends_on:
+        - workspace
       networks:
         - backend
 
@@ -694,3 +697,14 @@ services:
       depends_on:
         - workspace
       tty: true
+
+### Portainer ################################################
+    portainer:
+      build:
+        context: ./portainer
+      volumes:
+        - ${DATA_PATH_HOST}/portainer_data:/data
+        - /var/run/docker.sock:/var/run/docker.sock
+      ports:
+        - 9010:9000
+