Skip to content

Commit

Permalink
perf($Docker): specify Docker container tags
Browse files Browse the repository at this point in the history
[skip ci]
  • Loading branch information
johnnymillergh committed Feb 20, 2021
1 parent 1c1a033 commit e416c2c
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 14 deletions.
15 changes: 13 additions & 2 deletions docker/.env
Original file line number Diff line number Diff line change
@@ -1,7 +1,18 @@
##################################################
# TAG is the version number of the project #
# MAF_TAG is the version number of the project #
##################################################
TAG=0.0.2-SNAPSHOT
MAF_TAG=0.0.2-SNAPSHOT

##################################################
# Container version #
##################################################
MYSQL_TAG=8.0.22
REDIS_TAG=6.0.10-alpine3.13
ATMOZ_SFTP_TAG=alpine
ZIPKIN_MYSQL_TAG=2.22.2
ZIPKIN_DEPENDENCIES_TAG=2.6.3
ZIPKIN_TAG=2.23.2
CONSUL_TAG=1.9.3

##################################################
# SPRING_ENVIRONMENT available values: #
Expand Down
24 changes: 12 additions & 12 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ services:
################################################################################
mysql:
container_name: "${MYSQL_CONTAINER_NAME}"
image: mysql:latest
image: mysql:${MYSQL_TAG}
environment:
MYSQL_ROOT_PASSWORD: "jm@mysql"
MYSQL_DATABASE: muscle_and_fitness
Expand All @@ -23,7 +23,7 @@ services:

redis:
container_name: "${REDIS_CONTAINER_NAME}"
image: redis:latest
image: redis:${REDIS_TAG}
ports:
- "6379:6379"
restart: always
Expand All @@ -38,7 +38,7 @@ services:

atmoz-sftp:
container_name: "${ATMOZ_SFTP_CONTAINER_NAME}"
image: atmoz/sftp:latest
image: atmoz/sftp:${ATMOZ_SFTP_TAG}
ports:
# mapping local machine's port 23 to container port 22
- "23:22"
Expand All @@ -52,15 +52,15 @@ services:
muscle_and_fitness_network:

zipkin-mysql:
image: openzipkin/zipkin-mysql
container_name: "${ZIPKIN_MYSQL_CONTAINER_NAME}"
image: openzipkin/zipkin-mysql:{ZIPKIN_MYSQL_TAG}
restart: always
networks:
muscle_and_fitness_network:

zipkin-dependencies:
image: openzipkin/zipkin-dependencies
container_name: "${ZIPKIN_DEPENDENCIES_CONTAINER_NAME}"
image: openzipkin/zipkin-dependencies:${ZIPKIN_DEPENDENCIES_TAG}
entrypoint: crond -f
environment:
# Uncomment to see dependency processing logs
Expand All @@ -78,7 +78,7 @@ services:

zipkin:
container_name: "${ZIPKIN_CONTAINER_NAME}"
image: openzipkin/zipkin
image: openzipkin/zipkin:${ZIPKIN_TAG}
depends_on:
zipkin-mysql:
condition: service_healthy
Expand Down Expand Up @@ -111,7 +111,7 @@ services:
consul-service-registry:
container_name: "${CONSUL_SERVICE_REGISTRY_CONTAINER_NAME}"
hostname: "${CONSUL_SERVICE_REGISTRY_CONTAINER_NAME}"
image: consul:latest
image: consul:${CONSUL_TAG}
depends_on:
zipkin:
condition: service_healthy
Expand All @@ -127,7 +127,7 @@ services:
spring-boot-admin:
container_name: "${SPRING_BOOT_ADMIN_CONTAINER_NAME}"
hostname: "${SPRING_BOOT_ADMIN_CONTAINER_NAME}"
image: "ijohnnymiller/muscle-and-fitness-server.spring-boot-admin:${TAG}"
image: "ijohnnymiller/muscle-and-fitness-server.spring-boot-admin:${MAF_TAG}"
depends_on:
consul-service-registry:
condition: service_started
Expand All @@ -150,7 +150,7 @@ services:
api-gateway:
container_name: "${API_GATEWAY_CONTAINER_NAME}"
hostname: "${API_GATEWAY_CONTAINER_NAME}"
image: "ijohnnymiller/muscle-and-fitness-server.api-gateway:${TAG}"
image: "ijohnnymiller/muscle-and-fitness-server.api-gateway:${MAF_TAG}"
depends_on:
consul-service-registry:
condition: service_started
Expand All @@ -168,7 +168,7 @@ services:
auth-center:
container_name: "${AUTH_CENTER_CONTAINER_NAME}"
hostname: "${AUTH_CENTER_CONTAINER_NAME}"
image: "ijohnnymiller/muscle-and-fitness-server.auth-center:${TAG}"
image: "ijohnnymiller/muscle-and-fitness-server.auth-center:${MAF_TAG}"
depends_on:
consul-service-registry:
condition: service_started
Expand All @@ -184,7 +184,7 @@ services:
exercise-mis:
container_name: "${EXERCISE_MIS_CONTAINER_NAME}"
hostname: "${EXERCISE_MIS_CONTAINER_NAME}"
image: "ijohnnymiller/muscle-and-fitness-server.exercise-mis:${TAG}"
image: "ijohnnymiller/muscle-and-fitness-server.exercise-mis:${MAF_TAG}"
depends_on:
consul-service-registry:
condition: service_started
Expand All @@ -200,7 +200,7 @@ services:
muscle-mis:
container_name: "${MUSCLE_MIS_CONTAINER_NAME}"
hostname: "${MUSCLE_MIS_CONTAINER_NAME}"
image: "ijohnnymiller/muscle-and-fitness-server.muscle-mis:${TAG}"
image: "ijohnnymiller/muscle-and-fitness-server.muscle-mis:${MAF_TAG}"
depends_on:
consul-service-registry:
condition: service_started
Expand Down

0 comments on commit e416c2c

Please sign in to comment.