diff --git a/ansible/roles/docker/tasks/packages.yml b/ansible/roles/docker/tasks/packages.yml index 6d825a1..8f78354 100644 --- a/ansible/roles/docker/tasks/packages.yml +++ b/ansible/roles/docker/tasks/packages.yml @@ -1,17 +1,17 @@ --- # file: tasks/packages.yml +- import_tasks: packages_debian.yml + when: ansible_os_family|lower == "debian" + tags: + - debian + - name: packages - install/remove docker packages when: docker_packages is defined with_items: "{{ docker_packages|default([]) }}" package: name="{{item.name}}" state="{{item.state}}" become: yes -- import_tasks: packages_debian.yml - when: ansible_os_family|lower == "debian" - tags: - - debian - - name: packages - add docker package when: docker_package|length > 0 package: name="{{docker_package}}" state=present diff --git a/docker/compose/Dockerfile b/docker/compose/Dockerfile index 1b2fef5..c08cd67 100644 --- a/docker/compose/Dockerfile +++ b/docker/compose/Dockerfile @@ -3,7 +3,7 @@ LABEL maintainer aynic.os ARG DOCKER_BUILD_DIR ARG COMPOSE_REMOTE=https://github.com/docker/compose -ARG COMPOSE_VERSION=v2.5.0 +ARG COMPOSE_VERSION=2.5.0 ARG OPERATING_SYSTEM=Linux ARG PROCESSOR_ARCHITECTURE=x86_64 @@ -11,7 +11,7 @@ RUN apk update \ && apk add --no-cache ca-certificates \ && OS="$(echo ${OPERATING_SYSTEM} |awk '{print tolower($0)}')"; \ ARCH="$(echo ${PROCESSOR_ARCHITECTURE})"; \ - wget -qO /usr/bin/docker-compose ${COMPOSE_REMOTE}/releases/download/${COMPOSE_VERSION}/docker-compose-${OS}-${ARCH} \ + wget -qO /usr/bin/docker-compose ${COMPOSE_REMOTE}/releases/download/v${COMPOSE_VERSION}/docker-compose-${OS}-${ARCH} \ && chmod +x /usr/bin/docker-compose ENTRYPOINT ["/usr/bin/docker-compose"] diff --git a/docker/ipfs/Dockerfile b/docker/ipfs/Dockerfile index 42843c3..4e82a45 100644 --- a/docker/ipfs/Dockerfile +++ b/docker/ipfs/Dockerfile @@ -1,5 +1,5 @@ -ARG IPFS_VERSION=v0.13.0-rc1 -FROM ipfs/go-ipfs:${IPFS_VERSION} as dist +ARG IPFS_VERSION=0.13.0-rc1 +FROM ipfs/go-ipfs:v${IPFS_VERSION} as dist LABEL maintainer aynic.os ARG DOCKER_BUILD_DIR diff --git a/make/apps/def.docker.mk b/make/apps/def.docker.mk index 6fb91b4..b77778f 100644 --- a/make/apps/def.docker.mk +++ b/make/apps/def.docker.mk @@ -1,4 +1,5 @@ CMDS += docker-compose-exec docker-run docker-run-% +COMPOSE_ARGS ?= --ansi auto COMPOSE_FILE ?= $(wildcard docker/docker-compose.yml $(foreach file,$(patsubst docker/docker-compose.%,%,$(basename $(wildcard docker/docker-compose.*.yml))),$(if $(filter true,$(COMPOSE_FILE_$(file)) $(COMPOSE_FILE_$(call UPPERCASE,$(file)))),docker/docker-compose.$(file).yml))) COMPOSE_FILE_$(ENV) ?= true COMPOSE_FILE_DEBUG ?= $(if $(DEBUG),true) @@ -12,7 +13,7 @@ endif COMPOSE_IGNORE_ORPHANS ?= false COMPOSE_PROJECT_NAME ?= $(PROJECT_ENV)$(subst /,,$(subst -,,$(APP_PATH))) COMPOSE_SERVICE_NAME ?= $(subst _,-,$(COMPOSE_PROJECT_NAME)) -COMPOSE_VERSION ?= 1.29.2 +COMPOSE_VERSION ?= 2.5.0 CONTEXT += COMPOSE_FILE DOCKER_REPOSITORY CONTEXT_DEBUG += DOCKER_BUILD_TARGET DOCKER_IMAGE_TAG DOCKER_REGISTRY DOCKER_SERVICE DOCKER_SERVICES DOCKER_AUTHOR ?= $(DOCKER_AUTHOR_NAME) <$(DOCKER_AUTHOR_EMAIL)> @@ -25,8 +26,8 @@ DOCKER_BUILD_NO_CACHE ?= false DOCKER_BUILD_TARGET ?= $(if $(filter $(ENV),$(DOCKER_BUILD_TARGETS)),$(ENV),$(DOCKER_BUILD_TARGET_DEFAULT)) DOCKER_BUILD_TARGET_DEFAULT ?= master DOCKER_BUILD_TARGETS ?= $(ENV_DEPLOY) -DOCKER_BUILD_VARS ?= APP BRANCH DOCKER_GID DOCKER_REPOSITORY GID GIT_AUTHOR_EMAIL GIT_AUTHOR_NAME SSH_BASTION_HOSTNAME SSH_BASTION_USERNAME SSH_PRIVATE_IP_RANGE SSH_PUBLIC_HOST_KEYS SSH_REMOTE_HOSTS UID USER VERSION -DOCKER_COMPOSE ?= $(if $(DOCKER_RUN),docker/compose:$(COMPOSE_VERSION),$(or $(shell docker compose >/dev/null 2>&1 && printf 'docker compose\n'),docker-compose)) +DOCKER_BUILD_VARS ?= APP BRANCH COMPOSE_VERSION DOCKER_GID DOCKER_REPOSITORY GID GIT_AUTHOR_EMAIL GIT_AUTHOR_NAME OPERATING_SYSTEM PROCESSOR_ARCHITECTURE SSH_BASTION_HOSTNAME SSH_BASTION_USERNAME SSH_PRIVATE_IP_RANGE SSH_PUBLIC_HOST_KEYS SSH_REMOTE_HOSTS UID USER VERSION +DOCKER_COMPOSE ?= $(if $(DOCKER_RUN),docker/compose:$(COMPOSE_VERSION),$(or $(shell docker compose >/dev/null 2>&1 && printf 'docker compose\n'),docker-compose)) $(COMPOSE_ARGS) DOCKER_COMPOSE_DOWN_OPTIONS ?= DOCKER_COMPOSE_UP_OPTIONS ?= -d DOCKER_IMAGE_TAG ?= $(if $(filter $(ENV),$(ENV_DEPLOY)),$(VERSION),$(if $(DRONE_BUILD_NUMBER),$(DRONE_BUILD_NUMBER),latest)) @@ -44,7 +45,7 @@ DOCKER_REGISTRY_USERNAME ?= $(USER) DOCKER_REGISTRY_REPOSITORY ?= $(addsuffix /,$(DOCKER_REGISTRY))$(subst $(USER),$(DOCKER_REGISTRY_USERNAME),$(DOCKER_REPOSITORY)) DOCKER_REPOSITORY ?= $(subst _,/,$(COMPOSE_PROJECT_NAME)) DOCKER_SERVICE ?= $(lastword $(DOCKER_SERVICES)) -DOCKER_SERVICES ?= $(eval IGNORE_DRYRUN := true)$(shell $(call docker-compose,--log-level critical config --services))$(eval IGNORE_DRYRUN := false) +DOCKER_SERVICES ?= $(eval IGNORE_DRYRUN := true)$(shell $(call docker-compose,config --services 2>/dev/null))$(eval IGNORE_DRYRUN := false) DOCKER_SHELL ?= $(SHELL) ENV_VARS += COMPOSE_PROJECT_NAME COMPOSE_SERVICE_NAME DOCKER_BUILD_TARGET DOCKER_IMAGE_TAG DOCKER_REGISTRY DOCKER_REPOSITORY DOCKER_SHELL @@ -71,11 +72,13 @@ endif # function docker-compose: Run docker-compose with arg 1 define docker-compose $(call INFO,docker-compose,$(1)) + $(if $(DOCKER_RUN),$(call docker-build,$(MYOS)/docker/compose,docker/compose:$(COMPOSE_VERSION))) $(call run,$(DOCKER_COMPOSE) $(patsubst %,-f %,$(COMPOSE_FILE)) -p $(COMPOSE_PROJECT_NAME) $(1)) endef # function docker-compose-exec: Run docker-compose-exec with arg 2 in service 1 define docker-compose-exec $(call INFO,docker-compose-exec,$(1)$(comma) $(2)) + $(if $(DOCKER_RUN),$(call docker-build,$(MYOS)/docker/compose,docker/compose:$(COMPOSE_VERSION))) $(call run,$(DOCKER_COMPOSE) $(patsubst %,-f %,$(COMPOSE_FILE)) -p $(COMPOSE_PROJECT_NAME) exec -T $(1) sh -c '$(2)') endef @@ -94,7 +97,7 @@ endef define docker-commit $(call INFO,docker-commit,$(1)$(comma) $(2)$(comma) $(3)$(comma) $(4)) $(eval service := $(or $(1),$(DOCKER_SERVICE))) - $(eval container := $(or $(2),$(firstword $(shell $(call docker-compose,--log-level critical ps -q $(service)))))) + $(eval container := $(or $(2),$(firstword $(shell $(call docker-compose,ps -q $(service) 2>/dev/null))))) $(eval repository := $(or $(3),$(DOCKER_REPOSITORY)/$(service))) $(eval tag := $(or $(4),$(DOCKER_IMAGE_TAG))) $(RUN) docker commit $(container) $(repository):$(tag) diff --git a/make/apps/docker.mk b/make/apps/docker.mk index 050bcdd..5e6e881 100644 --- a/make/apps/docker.mk +++ b/make/apps/docker.mk @@ -9,7 +9,7 @@ docker-build: docker-images-myos # target docker-build-%: Call docker-build for each Dockerfile in docker/% folder .PHONY: docker-build-% docker-build-%: - if grep -q DOCKER_REPOSITORY docker/$*/Dockerfile 2>/dev/null; then $(eval DOCKER_BUILD_ARGS:=$(subst $(DOCKER_REPOSITORY),$(DOCKER_REPOSITORY_MYOS),$(DOCKER_BUILD_ARGS))) true; fi + if grep -q DOCKER_REPOSITORY docker/$*/Dockerfile 2>/dev/null; then $(eval DOCKER_BUILD_ARGS:=$(subst $(DOCKER_REPOSITORY),$(DOCKER_REPOSITORY_USER),$(DOCKER_BUILD_ARGS))) true; fi $(if $(wildcard docker/$*/Dockerfile),$(call docker-build,docker/$*)) $(if $(findstring :,$*),$(eval DOCKERFILES := $(wildcard docker/$(subst :,/,$*)/Dockerfile)),$(eval DOCKERFILES := $(wildcard docker/$*/*/Dockerfile))) $(foreach dockerfile,$(DOCKERFILES),$(call docker-build,$(dir $(dockerfile)),$(DOCKER_REPOSITORY)/$(word 2,$(subst /, ,$(dir $(dockerfile)))):$(lastword $(subst /, ,$(dir $(dockerfile)))),"") && true) diff --git a/make/apps/myos/def.setup.mk b/make/apps/myos/def.setup.mk index b1749b3..81c39bc 100644 --- a/make/apps/myos/def.setup.mk +++ b/make/apps/myos/def.setup.mk @@ -1,5 +1,5 @@ ENV_VARS += SETUP_SYSCTL_CONFIG -SETUP_BINFMT ?= $(if $(filter-out amd64 x86_64,$(PROCESSOR_ARCHITECTURE)),true,false) +SETUP_BINFMT ?= false SETUP_BINFMT_ARCH ?= all SETUP_NFSD ?= false SETUP_NFSD_OSX_CONFIG ?= nfs.server.bonjour=0 nfs.server.mount.regular_files=1 nfs.server.mount.require_resv_port=0 nfs.server.nfsd_threads=16 nfs.server.async=1 diff --git a/make/def.docker.mk b/make/def.docker.mk index 7294b97..90713d4 100644 --- a/make/def.docker.mk +++ b/make/def.docker.mk @@ -4,15 +4,15 @@ DOCKER_ENV_ARGS ?= $(docker_env_args) DOCKER_EXEC_OPTIONS ?= DOCKER_GID ?= $(call gid,docker) DOCKER_IMAGE ?= $(DOCKER_IMAGE_CLI) -DOCKER_IMAGE_CLI ?= $(DOCKER_REPOSITORY_MYOS)/cli -DOCKER_IMAGE_SSH ?= $(DOCKER_REPOSITORY_MYOS)/ssh +DOCKER_IMAGE_CLI ?= $(DOCKER_REPOSITORY_USER)/cli +DOCKER_IMAGE_SSH ?= $(DOCKER_REPOSITORY_USER)/ssh DOCKER_NAME ?= $(DOCKER_NAME_CLI) DOCKER_NAME_CLI ?= $(COMPOSE_PROJECT_NAME_USER)_cli DOCKER_NAME_SSH ?= $(COMPOSE_PROJECT_NAME_USER)_ssh DOCKER_NETWORK ?= $(DOCKER_NETWORK_PRIVATE) DOCKER_NETWORK_PRIVATE ?= $(USER_ENV) DOCKER_NETWORK_PUBLIC ?= $(COMPOSE_PROJECT_NAME_NODE) -DOCKER_REPOSITORY_MYOS ?= $(subst _,/,$(COMPOSE_PROJECT_NAME_USER)) +DOCKER_REPOSITORY_USER ?= $(subst _,/,$(COMPOSE_PROJECT_NAME_USER)) DOCKER_REPOSITORY_NODE ?= $(subst _,/,$(COMPOSE_PROJECT_NAME_NODE)) # DOCKER_RUN: if empty, run system command, else run it in a docker DOCKER_RUN ?= $(if $(filter-out false False FALSE,$(DOCKER)),$(DOCKER)) @@ -22,7 +22,7 @@ DOCKER_RUN_OPTIONS += --rm -it DOCKER_RUN_VOLUME += -v /var/run/docker.sock:/var/run/docker.sock DOCKER_RUN_WORKDIR ?= -w $(PWD) DOCKER_VOLUME_SSH ?= $(COMPOSE_PROJECT_NAME_USER)_ssh -ENV_VARS += DOCKER_IMAGE_CLI DOCKER_IMAGE_SSH DOCKER_NAME_CLI DOCKER_NAME_SSH DOCKER_NETWORK_PRIVATE DOCKER_NETWORK_PUBLIC DOCKER_REPOSITORY_MYOS DOCKER_REPOSITORY_NODE DOCKER_VOLUME_SSH +ENV_VARS += DOCKER_IMAGE_CLI DOCKER_IMAGE_SSH DOCKER_NAME_CLI DOCKER_NAME_SSH DOCKER_NETWORK_PRIVATE DOCKER_NETWORK_PUBLIC DOCKER_REPOSITORY_USER DOCKER_REPOSITORY_NODE DOCKER_VOLUME_SSH ifeq ($(DRONE), true) DOCKER_RUN_OPTIONS := --rm --network $(DOCKER_NETWORK) diff --git a/stack/drone/drone.yml b/stack/drone/drone.yml index 29b9202..87b11de 100644 --- a/stack/drone/drone.yml +++ b/stack/drone/drone.yml @@ -17,9 +17,8 @@ services: - DRONE_USER_CREATE=${DRONE_USER_CREATE} - DRONE_USER_FILTER=${DRONE_USER_FILTER} labels: - - SERVICE_80_NAME=${COMPOSE_SERVICE_NAME}-drone-80 - SERVICE_80_CHECK_TCP=true - - SERVICE_80_CHECK_INITIAL_STATUS=passing + - SERVICE_80_NAME=${COMPOSE_SERVICE_NAME}-drone:80 - SERVICE_80_TAGS=${DRONE_SERVER_SERVICE_80_TAGS} - SERVICE_443_IGNORE=true networks: diff --git a/stack/elastic/apm-server-oss.yml b/stack/elastic/apm-server-oss.yml index 9f83b18..d712090 100644 --- a/stack/elastic/apm-server-oss.yml +++ b/stack/elastic/apm-server-oss.yml @@ -11,7 +11,7 @@ services: 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: - SERVICE_8200_CHECK_HTTP=/ - - SERVICE_8200_NAME=${COMPOSE_SERVICE_NAME}-apm-server-oss-8200 + - SERVICE_8200_NAME=${COMPOSE_SERVICE_NAME}-apm-server-oss:8200 - SERVICE_8200_TAGS=${APM_SERVER_SERVICE_8200_TAGS} networks: - private diff --git a/stack/elastic/apm-server.yml b/stack/elastic/apm-server.yml index 0e374ac..7810e5b 100644 --- a/stack/elastic/apm-server.yml +++ b/stack/elastic/apm-server.yml @@ -6,7 +6,7 @@ services: 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} labels: - SERVICE_8200_CHECK_HTTP=/ - - SERVICE_8200_NAME=${COMPOSE_SERVICE_NAME}-apm-server-8200 + - SERVICE_8200_NAME=${COMPOSE_SERVICE_NAME}-apm-server:8200 - SERVICE_8200_TAGS=${APM_SERVER_SERVICE_8200_TAGS} networks: private: diff --git a/stack/elastic/elasticsearch.yml b/stack/elastic/elasticsearch.yml index 679b149..9a967ca 100644 --- a/stack/elastic/elasticsearch.yml +++ b/stack/elastic/elasticsearch.yml @@ -18,10 +18,10 @@ services: - http.cors.allow-headers=X-Requested-With,X-Auth-Token,Content-Type,Content-Length labels: - SERVICE_9200_CHECK_HTTP=/ - - SERVICE_9200_NAME=${COMPOSE_SERVICE_NAME}-elasticsearch-9200 + - SERVICE_9200_NAME=${COMPOSE_SERVICE_NAME}-elasticsearch:9200 - SERVICE_9200_TAGS=${ELASTICSEARCH_SERVICE_9200_TAGS} - SERVICE_9300_CHECK_TCP=true - - SERVICE_9300_NAME=${COMPOSE_SERVICE_NAME}-elasticsearch-9300 + - SERVICE_9300_NAME=${COMPOSE_SERVICE_NAME}-elasticsearch:9300 networks: - private - public diff --git a/stack/elastic/kibana-oss.yml b/stack/elastic/kibana-oss.yml index f29f32e..a4baf85 100644 --- a/stack/elastic/kibana-oss.yml +++ b/stack/elastic/kibana-oss.yml @@ -4,7 +4,7 @@ services: kibana-oss: labels: - SERVICE_5601_CHECK_HTTP=/app/kibana - - SERVICE_5601_NAME=${COMPOSE_SERVICE_NAME}-kibana-oss-5601 + - SERVICE_5601_NAME=${COMPOSE_SERVICE_NAME}-kibana-oss:5601 - SERVICE_5601_TAGS=${KIBANA_SERVICE_5601_TAGS} networks: - private diff --git a/stack/elastic/kibana.yml b/stack/elastic/kibana.yml index a2ec2f9..4657285 100644 --- a/stack/elastic/kibana.yml +++ b/stack/elastic/kibana.yml @@ -4,7 +4,7 @@ services: kibana: labels: - SERVICE_5601_CHECK_HTTP=/app/kibana - - SERVICE_5601_NAME=${COMPOSE_SERVICE_NAME}-kibana-5601 + - SERVICE_5601_NAME=${COMPOSE_SERVICE_NAME}-kibana:5601 - SERVICE_5601_TAGS=${KIBANA_SERVICE_5601_TAGS} networks: - private diff --git a/stack/grafana/grafana.yml b/stack/grafana/grafana.yml index 77bf9ee..1953b86 100644 --- a/stack/grafana/grafana.yml +++ b/stack/grafana/grafana.yml @@ -16,9 +16,8 @@ services: - GF_INSTALL_PLUGINS=grafana-clock-panel,grafana-simple-json-datasource image: ${DOCKER_REPOSITORY}/grafana:${DOCKER_IMAGE_TAG} labels: - - SERVICE_3000_NAME=${COMPOSE_SERVICE_NAME}-grafana-3000 - SERVICE_3000_CHECK_TCP=true - - SERVICE_3000_CHECK_INITIAL_STATUS=passing + - SERVICE_3000_NAME=${COMPOSE_SERVICE_NAME}-grafana:3000 - SERVICE_3000_TAGS=${GRAFANA_SERVICE_3000_TAGS} networks: - private diff --git a/stack/memcached/memcached.yml b/stack/memcached/memcached.yml index 850e4dc..4590ef7 100644 --- a/stack/memcached/memcached.yml +++ b/stack/memcached/memcached.yml @@ -5,7 +5,7 @@ services: image: memcached:alpine labels: - SERVICE_11211_CHECK_TCP=true - - SERVICE_11211_NAME=${COMPOSE_SERVICE_NAME}-memcached-11211 + - SERVICE_11211_NAME=${COMPOSE_SERVICE_NAME}-memcached:11211 networks: - private ports: diff --git a/stack/mysql/mysql.yml b/stack/mysql/mysql.yml index c902a4f..8f9c961 100644 --- a/stack/mysql/mysql.yml +++ b/stack/mysql/mysql.yml @@ -5,7 +5,7 @@ services: environment: - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} labels: - - SERVICE_3306_NAME=${COMPOSE_SERVICE_NAME}-mysql-3306 + - SERVICE_3306_NAME=${COMPOSE_SERVICE_NAME}-mysql:3306 - SERVICE_CHECK_SCRIPT=docker-healthcheck $$SERVICE_IP networks: - private diff --git a/stack/newrelic/php-daemon.yml b/stack/newrelic/php-daemon.yml index f24dba6..b462dc4 100644 --- a/stack/newrelic/php-daemon.yml +++ b/stack/newrelic/php-daemon.yml @@ -5,9 +5,8 @@ services: image: newrelic/php-daemon:latest # command: "/usr/bin/newrelic-daemon --loglevel debug" labels: - - SERVICE_31339_NAME=${COMPOSE_SERVICE_NAME}-php-daemon-31339 - SERVICE_31339_CHECK_TCP=true - - SERVICE_31339_CHECK_INITIAL_STATUS=passing + - SERVICE_31339_NAME=${COMPOSE_SERVICE_NAME}-php-daemon:31339 networks: - private ports: diff --git a/stack/nginx/static.yml b/stack/nginx/static.yml index ab539b8..389ff7d 100644 --- a/stack/nginx/static.yml +++ b/stack/nginx/static.yml @@ -5,9 +5,8 @@ services: image: nginx:alpine command: /bin/sh -c "grep autoindex /etc/nginx/conf.d/default.conf >/dev/null 2>&1 || sed -i 's|index index.html index.htm;|index index.html index.htm;\n autoindex on;|' /etc/nginx/conf.d/default.conf && nginx -g 'daemon off;'" labels: - - SERVICE_80_NAME=${COMPOSE_SERVICE_NAME}-nginx-80 - SERVICE_80_CHECK_TCP=true - - SERVICE_80_CHECK_INITIAL_STATUS=passing + - SERVICE_80_NAME=${COMPOSE_SERVICE_NAME}-nginx:80 - SERVICE_80_TAGS=${STATIC_SERVICE_80_TAGS} networks: - private diff --git a/stack/node/exporter/exporter.yml b/stack/node/exporter/exporter.yml index 8319784..5100fc3 100644 --- a/stack/node/exporter/exporter.yml +++ b/stack/node/exporter/exporter.yml @@ -5,9 +5,8 @@ services: image: google/cadvisor:latest hostname: ${HOSTNAME} labels: - - SERVICE_8080_NAME=${COMPOSE_SERVICE_NAME}-cadvisor-exporter-8080 - SERVICE_8080_CHECK_TCP=true - - SERVICE_8080_CHECK_INITIAL_STATUS=passing + - SERVICE_8080_NAME=${COMPOSE_SERVICE_NAME}-cadvisor-exporter:8080 - SERVICE_8080_TAGS=${CADVISOR_SERVICE_EXPORTER_8080_TAGS} - SERVICE_9200_IGNORE=true networks: @@ -29,9 +28,8 @@ services: image: prom/node-exporter:latest hostname: ${HOSTNAME} labels: - - SERVICE_9100_NAME=${COMPOSE_SERVICE_NAME}-node-exporter-9100 - SERVICE_9100_CHECK_TCP=true - - SERVICE_9100_CHECK_INITIAL_STATUS=passing + - SERVICE_9100_NAME=${COMPOSE_SERVICE_NAME}-node-exporter:9100 - SERVICE_9100_TAGS=${SERVICE_NODE_EXPORTER_HTTP_TAGS} networks: - public diff --git a/stack/node/node.yml b/stack/node/node.yml index 0f25bf2..47c8ba7 100644 --- a/stack/node/node.yml +++ b/stack/node/node.yml @@ -30,7 +30,7 @@ services: - SERVICE_8301_IGNORE=true - SERVICE_8302_IGNORE=true - SERVICE_8500_CHECK_HTTP=/v1/health/service/consul - - SERVICE_8500_NAME=${COMPOSE_SERVICE_NAME}-consul-8500 + - SERVICE_8500_NAME=${COMPOSE_SERVICE_NAME}-consul:8500 - SERVICE_8500_TAGS=${CONSUL_SERVICE_8500_TAGS} - SERVICE_8600_IGNORE=true - SERVICE_ADDRESS=${DOCKER_HOST_INET} @@ -58,10 +58,12 @@ services: - consul:${DOCKER_HOST_INET} hostname: ${HOSTNAME} labels: - - SERVICE_80_NAME=${COMPOSE_SERVICE_NAME}-fabio-80 - - SERVICE_443_NAME=${COMPOSE_SERVICE_NAME}-fabio-443 + - SERVICE_80_CHECK_TCP=true + - SERVICE_80_NAME=${COMPOSE_SERVICE_NAME}-fabio:80 + - SERVICE_443_CHECK_TCP=true + - SERVICE_443_NAME=${COMPOSE_SERVICE_NAME}-fabio:443 - SERVICE_9998_CHECK_HTTP=/routes - - SERVICE_9998_NAME=${COMPOSE_SERVICE_NAME}-fabio-9998 + - SERVICE_9998_NAME=${COMPOSE_SERVICE_NAME}-fabio:9998 - SERVICE_9998_TAGS=${FABIO_SERVICE_9998_TAGS} - SERVICE_9999_IGNORE=true ports: @@ -77,16 +79,19 @@ services: build: args: - DOCKER_BUILD_DIR=docker/ipfs + - IPFS_VERSION=0.13.0-rc1 context: ../.. dockerfile: docker/ipfs/Dockerfile image: ${DOCKER_REPOSITORY_NODE}/ipfs:${DOCKER_IMAGE_TAG} environment: - IPFS_PROFILE=${IPFS_PROFILE} labels: - - SERVICE_4001_NAME=${COMPOSE_SERVICE_NAME}-ipfs-4001 - - SERVICE_5001_NAME=${COMPOSE_SERVICE_NAME}-ipfs-5001 + - SERVICE_4001_CHECK_TCP=true + - SERVICE_4001_NAME=${COMPOSE_SERVICE_NAME}-ipfs:4001 + - SERVICE_5001_CHECK_TCP=true + - SERVICE_5001_NAME=${COMPOSE_SERVICE_NAME}-ipfs:5001 - SERVICE_8080_CHECK_HTTP=/ipfs/QmYwAPJzv5CZsnA625s3Xf2nemtYgPpHdWEz79ojWnPbdG/readme - - SERVICE_8080_NAME=${COMPOSE_SERVICE_NAME}-ipfs-8080 + - SERVICE_8080_NAME=${COMPOSE_SERVICE_NAME}-ipfs:8080 - SERVICE_8080_TAGS=${IPFS_SERVICE_8080_TAGS} - SERVICE_8081_IGNORE=true networks: diff --git a/stack/node/vsftpd/vsftpd-s3.yml b/stack/node/vsftpd/vsftpd-s3.yml index a8afc5f..dbca023 100644 --- a/stack/node/vsftpd/vsftpd-s3.yml +++ b/stack/node/vsftpd/vsftpd-s3.yml @@ -25,12 +25,10 @@ services: - PASV_MIN_PORT=${VSFTPD_S3_PASV_MIN_PORT} image: ${DOCKER_REPOSITORY}/vsftpd-s3:${DOCKER_IMAGE_TAG} labels: - - SERVICE_21_NAME=${COMPOSE_SERVICE_NAME}-vsftpd-s3-21 - SERVICE_21_CHECK_TCP=true - - SERVICE_21_CHECK_INITIAL_STATUS=passing - - SERVICE_22_NAME=${COMPOSE_SERVICE_NAME}-vsftpd-s3-22 + - SERVICE_21_NAME=${COMPOSE_SERVICE_NAME}-vsftpd-s3:21 - SERVICE_22_CHECK_TCP=true - - SERVICE_22_CHECK_INITIAL_STATUS=passing + - SERVICE_22_NAME=${COMPOSE_SERVICE_NAME}-vsftpd-s3:22 - SERVICE_65000_IGNORE=true hostname: ${HOSTNAME} security_opt: diff --git a/stack/portainer/portainer.yml b/stack/portainer/portainer.yml index 231ff74..a819994 100644 --- a/stack/portainer/portainer.yml +++ b/stack/portainer/portainer.yml @@ -6,7 +6,7 @@ services: labels: - SERVICE_8000_IGNORE=true - SERVICE_9000_CHECK_HTTP=/ - - SERVICE_9000_NAME=${COMPOSE_SERVICE_NAME}-portainer-9000 + - SERVICE_9000_NAME=${COMPOSE_SERVICE_NAME}-portainer:9000 - SERVICE_9000_TAGS=${PORTAINER_SERVICE_9000_TAGS} networks: - public diff --git a/stack/postgres/postgres.yml b/stack/postgres/postgres.yml index e3928d5..a3010f5 100644 --- a/stack/postgres/postgres.yml +++ b/stack/postgres/postgres.yml @@ -7,7 +7,8 @@ services: - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} - POSTGRES_USER=${POSTGRES_USER} labels: - - SERVICE_5432_NAME=${COMPOSE_SERVICE_NAME}-postgres-5432 + - SERVICE_5432_CHECK_TCP=true + - SERVICE_5432_NAME=${COMPOSE_SERVICE_NAME}-postgres:5432 networks: - private ports: diff --git a/stack/prometheus/alertmanager.yml b/stack/prometheus/alertmanager.yml index 86bb34d..4f3e829 100644 --- a/stack/prometheus/alertmanager.yml +++ b/stack/prometheus/alertmanager.yml @@ -10,9 +10,8 @@ services: dockerfile: docker/prometheus/alertmanager/Dockerfile image: ${DOCKER_REPOSITORY}/alertmanager:${DOCKER_IMAGE_TAG} labels: - - SERVICE_9093_NAME=${COMPOSE_SERVICE_NAME}-alertmanager-9093 - SERVICE_9093_CHECK_TCP=true - - SERVICE_9093_CHECK_INITIAL_STATUS=passing + - SERVICE_9093_NAME=${COMPOSE_SERVICE_NAME}-alertmanager:9093 - SERVICE_9093_TAGS=${ALERTMANAGER_SERVICE_9093_TAGS} networks: - private diff --git a/stack/prometheus/blackbox-exporter.yml b/stack/prometheus/blackbox-exporter.yml index 2c62f83..8a5226f 100644 --- a/stack/prometheus/blackbox-exporter.yml +++ b/stack/prometheus/blackbox-exporter.yml @@ -9,9 +9,8 @@ services: dockerfile: docker/prometheus/blackbox-exporter/Dockerfile image: ${DOCKER_REPOSITORY}/blackbox:${DOCKER_IMAGE_TAG} labels: - - SERVICE_9115_NAME=${COMPOSE_SERVICE_NAME}-blackbox-9115 - SERVICE_9115_CHECK_TCP=true - - SERVICE_9115_CHECK_INITIAL_STATUS=passing + - SERVICE_9115_NAME=${COMPOSE_SERVICE_NAME}-blackbox:9115 - SERVICE_9115_TAGS=${BLACKBOX_SERVICE_9115_TAGS} networks: - private diff --git a/stack/prometheus/es-exporter.yml b/stack/prometheus/es-exporter.yml index ac0b675..48eb195 100644 --- a/stack/prometheus/es-exporter.yml +++ b/stack/prometheus/es-exporter.yml @@ -10,9 +10,8 @@ services: command: -e ${ES_EXPORTER_ELASTICSEARCH_URL} image: ${DOCKER_REPOSITORY}/es-exporter:${DOCKER_IMAGE_TAG} labels: - - SERVICE_9206_NAME=${COMPOSE_SERVICE_NAME}-es-exporter-9206 - SERVICE_9206_CHECK_TCP=true - - SERVICE_9206_CHECK_INITIAL_STATUS=passing + - SERVICE_9206_NAME=${COMPOSE_SERVICE_NAME}-es-exporter:9206 - SERVICE_9206_TAGS=${ES_EXPORTER_SERVICE_9206_TAGS} networks: - private diff --git a/stack/prometheus/prometheus.yml b/stack/prometheus/prometheus.yml index 1d4e647..09c8ce6 100644 --- a/stack/prometheus/prometheus.yml +++ b/stack/prometheus/prometheus.yml @@ -11,9 +11,8 @@ services: dockerfile: docker/prometheus/prometheus/Dockerfile image: ${DOCKER_REPOSITORY}/prometheus:${DOCKER_IMAGE_TAG} labels: - - SERVICE_9090_NAME=${COMPOSE_SERVICE_NAME}-prometheus-9090 - SERVICE_9090_CHECK_TCP=true - - SERVICE_9090_CHECK_INITIAL_STATUS=passing + - SERVICE_9090_NAME=${COMPOSE_SERVICE_NAME}-prometheus:9090 - SERVICE_9090_TAGS=${PROMETHEUS_SERVICE_9090_TAGS} networks: - private diff --git a/stack/rabbitmq/rabbitmq.yml b/stack/rabbitmq/rabbitmq.yml index 4562a53..b1cb9db 100644 --- a/stack/rabbitmq/rabbitmq.yml +++ b/stack/rabbitmq/rabbitmq.yml @@ -7,10 +7,10 @@ services: - SERVICE_4369_IGNORE=true - SERVICE_5671_IGNORE=true - SERVICE_5672_CHECK_TCP=true - - SERVICE_5672_NAME=${COMPOSE_SERVICE_NAME}-rabbitmq-5672 + - SERVICE_5672_NAME=${COMPOSE_SERVICE_NAME}-rabbitmq:5672 - SERVICE_15671_IGNORE=true - SERVICE_15672_CHECK_HTTP=/ - - SERVICE_15672_NAME=${COMPOSE_SERVICE_NAME}-rabbitmq-15672 + - SERVICE_15672_NAME=${COMPOSE_SERVICE_NAME}-rabbitmq:15672 - SERVICE_15672_TAGS=${RABBITMQ_SERVICE_15672_TAGS} - SERVICE_25672_IGNORE=true networks: diff --git a/stack/redis/redis.yml b/stack/redis/redis.yml index c84c567..e25f4b1 100644 --- a/stack/redis/redis.yml +++ b/stack/redis/redis.yml @@ -6,7 +6,7 @@ services: command: redis-server --appendonly yes labels: - SERVICE_6379_CHECK_TCP=true - - SERVICE_6379_NAME=${COMPOSE_SERVICE_NAME}-redis-6379 + - SERVICE_6379_NAME=${COMPOSE_SERVICE_NAME}-redis:6379 networks: - private ports: diff --git a/stack/redmine/redmine.yml b/stack/redmine/redmine.yml index c8ec424..b7cbb97 100644 --- a/stack/redmine/redmine.yml +++ b/stack/redmine/redmine.yml @@ -22,9 +22,8 @@ services: - SMTP_PASS=${REDMINE_SMTP_PASS} - TZ=Europe/Paris labels: - - SERVICE_80_NAME=${COMPOSE_SERVICE_NAME}-redmine-80 - SERVICE_80_CHECK_TCP=true - - SERVICE_80_CHECK_INITIAL_STATUS=passing + - SERVICE_80_NAME=${COMPOSE_SERVICE_NAME}-redmine:80 - SERVICE_80_TAGS=${REDMINE_SERVICE_80_TAGS} - SERVICE_443_IGNORE=true networks: diff --git a/stack/redmine/redmine3.yml b/stack/redmine/redmine3.yml index 53d5b7f..7a65f37 100644 --- a/stack/redmine/redmine3.yml +++ b/stack/redmine/redmine3.yml @@ -15,9 +15,8 @@ services: - SMTP_PASS=${REDMINE3_SMTP_PASS} - TZ=Europe/Paris labels: - - SERVICE_80_NAME=${COMPOSE_SERVICE_NAME}-redmine3-80 - SERVICE_80_CHECK_TCP=true - - SERVICE_80_CHECK_INITIAL_STATUS=passing + - SERVICE_80_NAME=${COMPOSE_SERVICE_NAME}-redmine3:80 - SERVICE_80_TAGS=${REDMINE3_SERVICE_80_TAGS} - SERVICE_443_IGNORE=true networks: diff --git a/stack/theia/theia.yml b/stack/theia/theia.yml index 5f8ac75..56ab80d 100644 --- a/stack/theia/theia.yml +++ b/stack/theia/theia.yml @@ -22,9 +22,8 @@ services: - WORKSPACE_DIR=/Sources/${MONOREPO} image: ${DOCKER_REPOSITORY}/theia:${DOCKER_IMAGE_TAG} labels: - - SERVICE_3000_NAME=${COMPOSE_SERVICE_NAME}-theia-3000 - SERVICE_3000_CHECK_TCP=true - - SERVICE_3000_CHECK_INITIAL_STATUS=passing + - SERVICE_3000_NAME=${COMPOSE_SERVICE_NAME}-theia:3000 - SERVICE_3000_TAGS=${THEIA_SERVICE_3000_TAGS} networks: - private