diff --git a/docker/.env b/docker/.env index a476d1fe..d300bdf0 100644 --- a/docker/.env +++ b/docker/.env @@ -6,19 +6,19 @@ MAF_TAG=0.0.7 ################################################## # Container version # ################################################## -MYSQL_SERVER_TAG=8.0.26 +MYSQL_SERVER_TAG=8.0.28 REDIS_TAG=6.2.5-alpine REDIS_CLUSTER_TAG=6.2.5 +MINIO_TAG=RELEASE.2022-04-01T03-41-39Z ATMOZ_SFTP_TAG=alpine -MINIO_TAG=RELEASE.2021-06-17T00-10-46Z -RABBITMQ_TAG=3.9.5-management-alpine +RABBITMQ_TAG=3.9.14-management-alpine ZIPKIN_MYSQL_TAG=2.22.2 -ZIPKIN_DEPENDENCIES_TAG=2.6.3 -ZIPKIN_TAG=2.23.4 -CONSUL_TAG=1.11.2 -ELASTICSEARCH_TAG=7.17.0 -LOGSTASH_TAG=7.17.0 -KIBANA_TAG=7.17.0 +ZIPKIN_DEPENDENCIES_TAG=2.6.4 +ZIPKIN_TAG=2.23.16 +CONSUL_TAG=1.11.4 +ELASTICSEARCH_TAG=7.17.2 +LOGSTASH_TAG=7.17.2 +KIBANA_TAG=7.17.2 ################################################## # SPRING_ENVIRONMENT available values: # diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 3f3de6f7..c454a09a 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -94,33 +94,19 @@ services: networks: muscle_and_fitness_network: - atmoz-sftp: - container_name: ${ATMOZ_SFTP_CONTAINER_NAME} - image: atmoz/sftp:${ATMOZ_SFTP_TAG} - ports: - # mapping local machine's port 23 to container port 22 - - "23:22" - restart: always - volumes: - - "~/docker-file-mapping/${ATMOZ_SFTP_CONTAINER_NAME}:/home/johnny/upload" - environment: - TZ: ${MAF_TIMEZONE} - command: "johnny:atmoz@sftp:::upload" - networks: - muscle_and_fitness_network: - minio: container_name: ${MINIO_CONTAINER_NAME} image: minio/minio:${MINIO_TAG} ports: - "9900:9000" + - "9901:9900" restart: always volumes: - "~/docker-file-mapping/${MINIO_CONTAINER_NAME}:/data" environment: MINIO_ROOT_USER: ${MAF_MINIO_ROOT_USER} MINIO_ROOT_PASSWORD: ${MAF_MINIO_ROOT_PASSWORD} - command: server /data + command: server /data --console-address ":9900" healthcheck: test: [ "CMD", "curl", "-f", "http://localhost:9000/minio/health/live" ] interval: 30s @@ -129,6 +115,21 @@ services: networks: muscle_and_fitness_network: + atmoz-sftp: + container_name: ${ATMOZ_SFTP_CONTAINER_NAME} + image: atmoz/sftp:${ATMOZ_SFTP_TAG} + ports: + # mapping local machine's port 23 to container port 22 + - "23:22" + restart: always + volumes: + - "~/docker-file-mapping/${ATMOZ_SFTP_CONTAINER_NAME}:/home/johnny/upload" + environment: + TZ: ${MAF_TIMEZONE} + command: "johnny:atmoz@sftp:::upload" + networks: + muscle_and_fitness_network: + rabbitmq: container_name: ${RABBITMQ_CONTAINER_NAME} hostname: ${RABBITMQ_CONTAINER_NAME}