* elastic use include

+ add secrets to example

docker-compose.base.yml

@@ -73,9 +73,6 @@ services:
     restart: always
     environment:
       MYSQL_ROOT_PASSWORD: 123456
-    volumes:
-      - database:/var/lib/mysql
-      - ./hostfiles:/hostfiles
     ports:
       - "3306:3306"
   pma:

docker-compose.elastic.base.yml

@@ -13,12 +13,6 @@ services:
         soft: -1
         hard: -1
     mem_limit: 2g
-    volumes:
-      - elastic:/usr/share/elasticsearch/data
     expose:
       - "9200"
       - "9300"
-
-# Must be copied into main elastic docker-compose yml-file
-volumes:
-  elastic:

docker-compose.elastic.yml

@@ -1,24 +1,23 @@
 version: '3.6'
 
 services:
-  elasticsearch752:
-    extends:
-      file: docker-compose.elasticsearch.base.yml
-      service: elasticsearch
-    build:
-      context: ./dockerfiles/elasticsearch752
-    volumes:
-      - elastic752:/usr/share/elasticsearch/data
-
   elasticsearch732:
     extends:
       file: docker-compose.elasticsearch.base.yml
       service: elasticsearch
     build:
-      context: ./dockerfiles/elasticsearch732
+      dockerfile: elastic732.Dockerfile
     volumes:
       - elastic732:/usr/share/elasticsearch/data
+  elasticsearch752:
+    extends:
+      file: docker-compose.elasticsearch.base.yml
+      service: elasticsearch
+    build:
+      dockerfile: elastic752.Dockerfile
+    volumes:
+      - elastic752:/usr/share/elasticsearch/data
 
 volumes:
-  elastic752:
   elastic732:
+  elastic752:

docker-compose.minio.base.yml

@@ -4,13 +4,7 @@ services:
   minio:
     image: minio/minio:RELEASE.2020-06-12T00-06-19Z
     restart: always
-    volumes:
-      - minio:/minio
     environment:
       MINIO_ACCESS_KEY: ${MINIO_ACCESS_KEY}
       MINIO_SECRET_KEY: ${MINIO_SECRET_KEY}
     command: server /minio
-
-# Must be copied into main minio docker-compose yml-file
-volumes:
-  minio:

docker-compose.minio.yml

@@ -5,6 +5,8 @@ services:
     extends:
       file: docker-compose.minio.base.yml
       service: minio
+    volumes:
+      - minio:/minio
 
 volumes:
   minio:

docker-compose.yml.example

@@ -44,3 +44,11 @@ services:
 
 volumes:
   database:
+
+secrets:
+  user_ssh_key:
+    file: ~/.ssh/id_rsa
+  user_known_hosts:
+    file: ~/.ssh/known_hosts
+  composer_auth:
+    file: ~/.composer/auth.json

dockerfiles/elasticsearch/elastic.base.Dockerfile

@@ -0,0 +1 @@
+RUN elasticsearch-plugin install analysis-icu

dockerfiles/elasticsearch/elastic732.Dockerfile

@@ -0,0 +1,4 @@
+# syntax = edrevo/dockerfile-plus
+FROM docker.elastic.co/elasticsearch/elasticsearch:7.3.2
+
+INCLUDE+ ./elastic.base.Dockerfile

dockerfiles/elasticsearch/elastic752.Dockerfile

@@ -0,0 +1,4 @@
+# syntax = edrevo/dockerfile-plus
+FROM docker.elastic.co/elasticsearch/elasticsearch:7.5.2
+
+INCLUDE+ ./elastic.base.Dockerfile

dockerfiles/elasticsearch732/Dockerfile

@@ -1,3 +0,0 @@
-FROM docker.elastic.co/elasticsearch/elasticsearch:7.3.2
-
-RUN elasticsearch-plugin install analysis-icu

dockerfiles/elasticsearch752/Dockerfile

@@ -1,3 +0,0 @@
-FROM docker.elastic.co/elasticsearch/elasticsearch:7.5.2
-
-RUN elasticsearch-plugin install analysis-icu

dockerfiles/workspace/crontab/laradock

@@ -1 +0,0 @@
-* * * * * laradock /usr/bin/php /var/www/artisan schedule:run >> /dev/null 2>&1

dockerfiles/workspace/crontab73/laradock

@@ -0,0 +1 @@
+#* * * * * laradock /usr/bin/php /var/www/artisan schedule:run >> /dev/null 2>&1

dockerfiles/workspace/crontab74/laradock

@@ -0,0 +1 @@
+#* * * * * laradock /usr/bin/php /var/www/artisan schedule:run >> /dev/null 2>&1

dockerfiles/workspace/workspace.base.Dockerfile

@@ -117,7 +117,9 @@ RUN if [ ${INSTALL_SSH} = true ]; then \
 USER laradock
 
 RUN if [ ${INSTALL_SSH} = true ]; then \
-    mkdir -p ~/.ssh && ln -s /run/secrets/user_ssh_key ~/.ssh/id_rsa \
+    mkdir -p ~/.ssh \
+    && ln -s /run/secrets/user_ssh_key ~/.ssh/id_rsa \
+    && ln -s /run/secrets/user_known_hosts ~/.ssh/known_hosts \
 ;fi
 
 ###########################################################################
@@ -433,23 +435,12 @@ COPY ./minio/auth.json /home/laradock/.mc/config.json
 USER laradock
 
 RUN if [ ${INSTALL_SSH} = true ]; then \
-    mkdir -p ~/.ssh && ln -s /run/secrets/user_ssh_key ~/.ssh/id_rsa \
     && ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts \
     && ssh-keyscan -t rsa bitbucket.org >> ~/.ssh/known_hosts \
     && ssh-keyscan -t rsa gitlab.com >> ~/.ssh/known_hosts \
     && ssh-keyscan -t rsa vcs.wpstudio.ru >> ~/.ssh/known_hosts \
 ;fi
 
-###########################################################################
-# Crontab
-###########################################################################
-
-USER root
-
-COPY ./crontab /etc/cron.d
-
-RUN chmod -R 644 /etc/cron.d
-
 #
 #--------------------------------------------------------------------------
 # Final Touch

dockerfiles/workspace/workspace73.Dockerfile

@@ -10,3 +10,13 @@ INCLUDE+ ./workspace.base.Dockerfile
 ###########################################################################
 
 RUN pecl install -a redis
+
+###########################################################################
+# Crontab
+###########################################################################
+
+USER root
+
+COPY ./crontab73 /etc/cron.d
+
+RUN chmod -R 644 /etc/cron.d

dockerfiles/workspace/workspace74.Dockerfile

@@ -11,3 +11,13 @@ INCLUDE+ ./workspace.base.Dockerfile
 
 RUN pecl install igbinary \
     && pecl install -a redis
+
+###########################################################################
+# Crontab
+###########################################################################
+
+USER root
+
+COPY ./crontab74 /etc/cron.d
+
+RUN chmod -R 644 /etc/cron.d