update docker images

stack/base/base.yml

@@ -6,6 +6,8 @@ services:
       args:
       - DOCKER_BUILD_DIR=docker/cli
       - GID=${GID}
+      - GIT_AUTHOR_NAME=${GIT_AUTHOR_NAME}
+      - GIT_AUTHOR_EMAIL=${GIT_AUTHOR_EMAIL}
       - UID=${UID}
       - USER=${USER}
       - SSH_BASTION_HOSTNAME=${SSH_BASTION_HOSTNAME}
@@ -14,7 +16,6 @@ services:
       - SSH_PRIVATE_IP_RANGE=${SSH_RIVATE_IP_RANGE}
       context: ../..
       dockerfile: docker/cli/Dockerfile
-      target: ${DOCKER_BUILD_TARGET}
     command: tail -f /dev/null
     container_name: ${DOCKER_NAME_CLI}
     depends_on:
@@ -38,7 +39,6 @@ services:
       - USER=${USER}
       context: ../..
       dockerfile: docker/ssh/Dockerfile
-      target: ${DOCKER_BUILD_TARGET}
     container_name: ${DOCKER_NAME_SSH}
     image: ${DOCKER_IMAGE_SSH}:${DOCKER_IMAGE_TAG}
     networks:

stack/elastic/apm-server-oss.yml

@@ -4,9 +4,9 @@ services:
   apm-server-oss:
     build:
       args:
-      - DOCKER_BUILD_DIR=docker/apm-server-oss
+      - DOCKER_BUILD_DIR=docker/elastic/apm-server-oss
       context: ../..
-      dockerfile: docker/apm-server-oss/Dockerfile
+      dockerfile: docker/elastic/apm-server-oss/Dockerfile
     image: ${DOCKER_REPOSITORY}/apm-server-oss:${DOCKER_IMAGE_TAG}
     command: -c apm-server.yml --strict.perms=false -e -E output.elasticsearch.hosts=["${ELASTICSEARCH_HOST}:${ELASTICSEARCH_PORT}"] -E output.elasticsearch.protocol=${ELASTICSEARCH_PROTOCOL} -E output.elasticsearch.username=${ELASTICSEARCH_USERNAME} -E output.elasticsearch.password=${ELASTICSEARCH_PASSWORD} -E apm-server.register.ingest.pipeline.enabled=false
     labels:

stack/elastic/curator.yml

@@ -7,7 +7,6 @@ services:
       - DOCKER_BUILD_DIR=docker/elastic/curator
       context: ../..
       dockerfile: docker/elastic/curator/Dockerfile
-      target: ${DOCKER_BUILD_TARGET}
     environment:
     - DEPLOY=${DEPLOY}
     - HOSTS=${ELASTICSEARCH_PROTOCOL}://${ELASTICSEARCH_HOST}

stack/mysql/mysql.yml

@@ -5,7 +5,7 @@ services:
     environment:
     - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
     labels:
-    - SERVICE_CHECK_SCRIPT=container-check-status $$SERVICE_IP
+    - SERVICE_CHECK_SCRIPT=docker-healthcheck $$SERVICE_IP
     - SERVICE_3306_NAME=${COMPOSE_SERVICE_NAME}-mysql-3306
     networks:
     - private

stack/node/node.yml

@@ -38,13 +38,13 @@ services:
     - consul:/consul/data
     - /var/run/docker.sock:/var/run/docker.sock
   fabio:
+    image: fabiolb/fabio:latest
     command: -registry.backend "consul" -registry.consul.addr "consul:8500" -registry.consul.token "$FABIO_CONSUL_HTTP_TOKEN" -proxy.addr ":80,:443;cs=local" -proxy.cs "cs=local;type=file;cert=/certs/${DOMAIN}.crt.pem;key=/certs/${DOMAIN}.key.pem"
     depends_on:
     - consul
     extra_hosts:
     - consul:${DOCKER_HOST_INET}
     hostname: ${HOSTNAME}
-    image: fabiolb/fabio:latest
     labels:
     - SERVICE_80_CHECK_TCP=true
     - SERVICE_80_NAME=${COMPOSE_SERVICE_NAME}-fabio-80
@@ -83,8 +83,11 @@ services:
     build:
       args:
       - DOCKER_BUILD_DIR=docker/registrator
+      - GIT_AUTHOR_NAME=${GIT_AUTHOR_NAME}
+      - GIT_AUTHOR_EMAIL=${GIT_AUTHOR_EMAIL}
       context: ../..
       dockerfile: docker/registrator/Dockerfile
+    image: ${DOCKER_REPOSITORY_NODE}/registrator:${DOCKER_IMAGE_TAG}
     command: -internal -cleanup -deregister always -resync=30 -useIpFromNetwork node -useIpFromLabel SERVICE_ADDRESS consul://consul:8500
     depends_on:
     - consul
@@ -93,7 +96,6 @@ services:
     extra_hosts:
     - consul:${DOCKER_HOST_INET}
     hostname: ${HOSTNAME}
-    image: ${DOCKER_REPOSITORY_NODE}/registrator:${DOCKER_IMAGE_TAG}
     network_mode: host
     restart: always
     volumes:

stack/prometheus/alertmanager.yml

@@ -4,10 +4,10 @@ services:
   alertmanager:
     build:
       args:
-      - DOCKER_BUILD_DIR=docker/alertmanager
+      - DOCKER_BUILD_DIR=docker/prometheus/alertmanager
       - SLACK_WEBHOOK_ID=${ALERTMANAGER_SLACK_WEBHOOK_ID}
       context: ../..
-      dockerfile: docker/alertmanager/Dockerfile
+      dockerfile: docker/prometheus/alertmanager/Dockerfile
     image: ${DOCKER_REPOSITORY}/alertmanager:${DOCKER_IMAGE_TAG}
     labels:
     - SERVICE_9093_NAME=${COMPOSE_SERVICE_NAME}-alertmanager-9093

stack/prometheus/blackbox-exporter.yml

@@ -4,9 +4,9 @@ services:
   blackbox:
     build:
       args:
-      - DOCKER_BUILD_DIR=docker/blackbox
+      - DOCKER_BUILD_DIR=docker/prometheus/blackbox-exporter
       context: ../..
-      dockerfile: docker/blackbox/Dockerfile
+      dockerfile: docker/prometheus/blackbox-exporter/Dockerfile
     image: ${DOCKER_REPOSITORY}/blackbox:${DOCKER_IMAGE_TAG}
     labels:
     - SERVICE_9115_NAME=${COMPOSE_SERVICE_NAME}-blackbox-9115

stack/prometheus/es-exporter.yml

@@ -4,9 +4,9 @@ services:
   es-exporter:
     build:
       args:
-      - DOCKER_BUILD_DIR=docker/es-exporter
+      - DOCKER_BUILD_DIR=docker/prometheus/es-exporter
       context: ../..
-      dockerfile: docker/es-exporter/Dockerfile
+      dockerfile: docker/prometheus/es-exporter/Dockerfile
     command: -e ${ES_EXPORTER_ELASTICSEARCH_URL}
     image: ${DOCKER_REPOSITORY}/es-exporter:${DOCKER_IMAGE_TAG}
     labels:

stack/prometheus/prometheus.yml

@@ -4,11 +4,11 @@ services:
   prometheus:
     build:
       args:
-      - DOCKER_BUILD_DIR=docker/prometheus
+      - DOCKER_BUILD_DIR=docker/prometheus/prometheus
       - MONITORING_PRIMARY_TARGETS_BLACKBOX=${PROMETHEUS_MONITORING_PRIMARY_TARGETS_BLACKBOX}
       - MONITORING_SECONDARY_TARGETS_BLACKBOX=${PROMETHEUS_MONITORING_SECONDARY_TARGETS_BLACKBOX}
       context: ../..
-      dockerfile: docker/prometheus/Dockerfile
+      dockerfile: docker/prometheus/prometheus/Dockerfile
     image: ${DOCKER_REPOSITORY}/prometheus:${DOCKER_IMAGE_TAG}
     labels:
     - SERVICE_9090_NAME=${COMPOSE_SERVICE_NAME}-prometheus-9090

stack/sematext/logagent.yml

@@ -5,9 +5,10 @@ services:
     build:
       args:
       - DOCKER_BUILD_DIR=docker/sematext/logagent
+      - GIT_AUTHOR_NAME=${GIT_AUTHOR_NAME}
+      - GIT_AUTHOR_EMAIL=${GIT_AUTHOR_EMAIL}
       context: ../..
       dockerfile: docker/sematext/logagent/Dockerfile
-      target: ${DOCKER_BUILD_TARGET}
     image: ${DOCKER_REPOSITORY}/logagent:${DOCKER_IMAGE_TAG}
     environment:
     - LOGAGENT_ARGS=-u 514 --docker /tmp/docker.sock --dockerEvents

stack/theia/theia.yml

@@ -5,9 +5,10 @@ services:
     build:
       args:
       - DOCKER_BUILD_DIR=docker/theia
+      - GIT_AUTHOR_NAME=${GIT_AUTHOR_NAME}
+      - GIT_AUTHOR_EMAIL=${GIT_AUTHOR_EMAIL}
       context: ../..
       dockerfile: docker/theia/Dockerfile
-      target: ${DOCKER_BUILD_TARGET}
     environment:
     - ENV=${ENV}
     - MONOREPO_DIR=${MONOREPO_DIR}