Changed docker image naming style, removed(commented) healthcheck
This commit is contained in:
parent
78602c4ef9
commit
ea855dc311
2 changed files with 15 additions and 17 deletions
6
Makefile
6
Makefile
|
@ -43,8 +43,8 @@ cmd-dev:
|
||||||
|
|
||||||
cmd-docker-build:
|
cmd-docker-build:
|
||||||
docker build \
|
docker build \
|
||||||
-t ${REPO_OWNER_LOWER}/${REPO_NAME_SNAKE}:latest \
|
-t ${REPO_OWNER_LOWER}/${REPO_NAME_KEBAB}:latest \
|
||||||
-t ${REPO_OWNER_LOWER}/${REPO_NAME_SNAKE}:$${VERSION} .
|
-t ${REPO_OWNER_LOWER}/${REPO_NAME_KEBAB}:$${VERSION} .
|
||||||
|
|
||||||
cmd-docker-push:
|
cmd-docker-push:
|
||||||
docker push -a ${REPO_OWNER_LOWER}/${REPO_NAME_SNAKE}
|
docker push -a ${REPO_OWNER_LOWER}/${REPO_NAME_KEBAB}
|
||||||
|
|
|
@ -3,35 +3,33 @@ version: "3"
|
||||||
services:
|
services:
|
||||||
|
|
||||||
app:
|
app:
|
||||||
image: ${REPO_OWNER_LOWER}/${REPO_NAME_SNAKE}:latest
|
image: ${REPO_OWNER_LOWER}/${REPO_NAME_KEBAB}:latest
|
||||||
container_name: ${REPO_NAME_SNAKE}
|
container_name: ${REPO_NAME_KEBAB}-app
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
ports:
|
ports:
|
||||||
- "8080:8000"
|
- "8080:8000"
|
||||||
links:
|
links:
|
||||||
- database
|
- database
|
||||||
env_file: .env
|
env_file: .env
|
||||||
depends_on:
|
|
||||||
database:
|
|
||||||
condition: service_healthy
|
|
||||||
|
|
||||||
database:
|
database:
|
||||||
image: mariadb:latest
|
image: linuxserver/mariadb:latest
|
||||||
container_name: ${REPO_NAME_SNAKE}_db
|
container_name: ${REPO_NAME_KEBAB}-db
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
volumes:
|
volumes:
|
||||||
#- "./database:/var/lib/mysql"
|
#- "./database:/var/lib/mysql"
|
||||||
- "db_data:/var/lib/mysql"
|
- "database:/var/lib/mysql"
|
||||||
env_file: .env_db
|
env_file: .env_db
|
||||||
healthcheck:
|
# Uncomment if needed
|
||||||
test: sh -c "mysqladmin ping -u$$$$MYSQL_USER -p$$$$MYSQL_PASSWORD"
|
#healthcheck:
|
||||||
interval: 1s
|
# test: sh -c "mysqladmin ping -u$$$$MYSQL_USER -p$$$$MYSQL_PASSWORD"
|
||||||
timeout: 3s
|
# interval: 2s
|
||||||
retries: 20
|
# timeout: 3s
|
||||||
|
# retries: 20
|
||||||
|
|
||||||
# Comment or remove these lines and
|
# Comment or remove these lines and
|
||||||
# edit `volumes` in services->database
|
# edit `volumes` in services->database
|
||||||
# if you are going to store
|
# if you are going to store
|
||||||
# your DB in a directory
|
# your DB in a directory
|
||||||
volumes:
|
volumes:
|
||||||
db_data:
|
database:
|
||||||
|
|
Loading…
Reference in a new issue