diff --git a/docker-compose.base.yml b/docker-compose.base.yml index 9cabd89..28855b0 100755 --- a/docker-compose.base.yml +++ b/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: diff --git a/docker-compose.elastic.base.yml b/docker-compose.elastic.base.yml index cfe3b41..46224de 100755 --- a/docker-compose.elastic.base.yml +++ b/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: diff --git a/docker-compose.elastic.yml b/docker-compose.elastic.yml index a69da14..d549c59 100755 --- a/docker-compose.elastic.yml +++ b/docker-compose.elastic.yml @@ -1,24 +1,23 @@ version: '3.6' services: - elasticsearch752: + elasticsearch732: extends: file: docker-compose.elasticsearch.base.yml service: elasticsearch build: - context: ./dockerfiles/elasticsearch752 + dockerfile: elastic732.Dockerfile volumes: - - elastic752:/usr/share/elasticsearch/data - - elasticsearch732: + - elastic732:/usr/share/elasticsearch/data + elasticsearch752: extends: file: docker-compose.elasticsearch.base.yml service: elasticsearch build: - context: ./dockerfiles/elasticsearch732 + dockerfile: elastic752.Dockerfile volumes: - - elastic732:/usr/share/elasticsearch/data + - elastic752:/usr/share/elasticsearch/data volumes: - elastic752: elastic732: + elastic752: diff --git a/docker-compose.minio.base.yml b/docker-compose.minio.base.yml index 35fe5f6..d0cbd5c 100755 --- a/docker-compose.minio.base.yml +++ b/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: diff --git a/docker-compose.minio.yml b/docker-compose.minio.yml index d9b1b26..b101696 100755 --- a/docker-compose.minio.yml +++ b/docker-compose.minio.yml @@ -5,6 +5,8 @@ services: extends: file: docker-compose.minio.base.yml service: minio + volumes: + - minio:/minio volumes: minio: diff --git a/docker-compose.yml.example b/docker-compose.yml.example index 3ab0985..5ca4555 100755 --- a/docker-compose.yml.example +++ b/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 diff --git a/dockerfiles/elasticsearch/elastic.base.Dockerfile b/dockerfiles/elasticsearch/elastic.base.Dockerfile new file mode 100644 index 0000000..158b47b --- /dev/null +++ b/dockerfiles/elasticsearch/elastic.base.Dockerfile @@ -0,0 +1 @@ +RUN elasticsearch-plugin install analysis-icu diff --git a/dockerfiles/elasticsearch/elastic732.Dockerfile b/dockerfiles/elasticsearch/elastic732.Dockerfile new file mode 100644 index 0000000..2c930d5 --- /dev/null +++ b/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 diff --git a/dockerfiles/elasticsearch/elastic752.Dockerfile b/dockerfiles/elasticsearch/elastic752.Dockerfile new file mode 100644 index 0000000..b01b520 --- /dev/null +++ b/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 diff --git a/dockerfiles/elasticsearch732/Dockerfile b/dockerfiles/elasticsearch732/Dockerfile deleted file mode 100644 index acf321c..0000000 --- a/dockerfiles/elasticsearch732/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM docker.elastic.co/elasticsearch/elasticsearch:7.3.2 - -RUN elasticsearch-plugin install analysis-icu diff --git a/dockerfiles/elasticsearch752/Dockerfile b/dockerfiles/elasticsearch752/Dockerfile deleted file mode 100644 index 7972d96..0000000 --- a/dockerfiles/elasticsearch752/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM docker.elastic.co/elasticsearch/elasticsearch:7.5.2 - -RUN elasticsearch-plugin install analysis-icu diff --git a/dockerfiles/workspace/crontab/laradock b/dockerfiles/workspace/crontab/laradock deleted file mode 100644 index d21529b..0000000 --- a/dockerfiles/workspace/crontab/laradock +++ /dev/null @@ -1 +0,0 @@ -* * * * * laradock /usr/bin/php /var/www/artisan schedule:run >> /dev/null 2>&1 diff --git a/dockerfiles/workspace/crontab73/laradock b/dockerfiles/workspace/crontab73/laradock new file mode 100644 index 0000000..482c6ce --- /dev/null +++ b/dockerfiles/workspace/crontab73/laradock @@ -0,0 +1 @@ +#* * * * * laradock /usr/bin/php /var/www/artisan schedule:run >> /dev/null 2>&1 diff --git a/dockerfiles/workspace/crontab74/laradock b/dockerfiles/workspace/crontab74/laradock new file mode 100644 index 0000000..482c6ce --- /dev/null +++ b/dockerfiles/workspace/crontab74/laradock @@ -0,0 +1 @@ +#* * * * * laradock /usr/bin/php /var/www/artisan schedule:run >> /dev/null 2>&1 diff --git a/dockerfiles/workspace/workspace.base.Dockerfile b/dockerfiles/workspace/workspace.base.Dockerfile index 0ffd3e5..e929f11 100644 --- a/dockerfiles/workspace/workspace.base.Dockerfile +++ b/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 diff --git a/dockerfiles/workspace/workspace73.Dockerfile b/dockerfiles/workspace/workspace73.Dockerfile index 545c9b8..b70f3f6 100644 --- a/dockerfiles/workspace/workspace73.Dockerfile +++ b/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 diff --git a/dockerfiles/workspace/workspace74.Dockerfile b/dockerfiles/workspace/workspace74.Dockerfile index 16701b3..3450228 100644 --- a/dockerfiles/workspace/workspace74.Dockerfile +++ b/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