Dockery/Docker-Chevereto
1
0
Fork 0
mirror of https://github.com/chevereto/docker.git synced 2025-12-14 20:19:44 +01:00
Code Issues Packages Projects Releases Activity

fix feedback

Browse Source
This commit is contained in:
Rodolfo Berrios
2024-02-16 16:48:00 -03:00
parent 35b19fe499
commit 3e38ce2fad
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Makefile
View File

@@ -189,39 +189,37 @@ setup: cron proxy
# Docker compose # Docker compose
up: feedback feedback--compose feedback--url up: feedback--compose feedback--url
${DOCKER_COMPOSE} up ${DOCKER_COMPOSE} up
up-d: feedback feedback--compose feedback--url up-d: feedback--compose feedback--url
${DOCKER_COMPOSE} up -d ${DOCKER_COMPOSE} up -d
stop: feedback feedback--compose stop: feedback--compose
${DOCKER_COMPOSE} stop ${DOCKER_COMPOSE} stop
start: feedback feedback--compose start: feedback--compose
${DOCKER_COMPOSE} start ${DOCKER_COMPOSE} start
restart: feedback feedback--compose restart: feedback--compose
${DOCKER_COMPOSE} restart ${DOCKER_COMPOSE} restart
down: feedback feedback--compose down: feedback--compose
${DOCKER_COMPOSE} down ${DOCKER_COMPOSE} down
down--volumes: feedback feedback--compose down--volumes: feedback--compose
${DOCKER_COMPOSE} down --volumes ${DOCKER_COMPOSE} down --volumes
# Instances # Instances
spawn: feedback feedback--compose feedback--url cloudflare--create up-d
.PHONY: deploy .PHONY: deploy
deploy: deploy:
@./scripts/system/deploy.sh @./scripts/system/deploy.sh
update: feedback feedback--compose feedback--url update: feedback--compose feedback--url
@./scripts/system/update.sh @./scripts/system/update.sh
destroy: feedback feedback--compose cloudflare--delete destroy: feedback--compose cloudflare--delete
${DOCKER_COMPOSE} down --volumes ${DOCKER_COMPOSE} down --volumes
@rm namespace/${NAMESPACE} @rm namespace/${NAMESPACE}

8
scripts/system/deploy.sh
View File

@@ -18,17 +18,19 @@ if [ -z ${CLOUDFLARE_A_NAME} ]; then
else else
HOSTNAME="${NAMESPACE}.${DOMAIN}" HOSTNAME="${NAMESPACE}.${DOMAIN}"
fi fi
make --no-print-directory feedback
echo "* Using hostname ${HOSTNAME}" echo "* Using hostname ${HOSTNAME}"
make --no-print-directory feedback feedback--compose feedback--url NAMESPACE=${NAMESPACE} make --no-print-directory feedback--compose feedback--url NAMESPACE=${NAMESPACE}
make --no-print-directory namespace NAMESPACE=${NAMESPACE} HOSTNAME="${HOSTNAME}" make --no-print-directory namespace NAMESPACE=${NAMESPACE} HOSTNAME="${HOSTNAME}"
if [ -n "${CLOUDFLARE_A_NAME}" ]; then if [ -n "${CLOUDFLARE_A_NAME}" ]; then
make --no-print-directory cloudflare--create NAMESPACE=${NAMESPACE} make --no-print-directory cloudflare--create NAMESPACE=${NAMESPACE}
fi fi
make --no-print-directory up-d NAMESPACE=${NAMESPACE} make --no-print-directory up-d NAMESPACE=${NAMESPACE}
make --no-print-directory install NAMESPACE=${NAMESPACE} ADMIN_USER=${ADMIN_USER} ADMIN_EMAIL=${ADMIN_EMAIL} ADMIN_PASSWORD=${ADMIN_PASSWORD} make --no-print-directory install NAMESPACE=${NAMESPACE} ADMIN_USER=${ADMIN_USER} ADMIN_EMAIL=${ADMIN_EMAIL} ADMIN_PASSWORD=${ADMIN_PASSWORD}
echo ""
echo "[OK] Deployment complete!" echo "[OK] Deployment complete!"
cat <<EOF cat <<EOF
Sigan bailando, sigan bailando
_ .-. _ .-.
/ ) .-. ___ __ ( ) / ) .-. ___ __ ( )
( ( ( ) .'___) (__'-._) ( ( ( ( ) .'___) (__'-._) (
@@ -45,7 +47,7 @@ cat <<EOF
___\ | \___; / , / ___\ | \___; / , /
/ ___) ( ( ( / ___) ( ( (
'.' ) ;) ; '.' ) ;) ;
Sigan bailando! (_/(_/ Hagan la clave, hagan la clave! (_/(_/
---------------------------------------------------- ----------------------------------------------------
EOF EOF
NAMESPACE=${NAMESPACE} make --no-print-directory feedback--url NAMESPACE=${NAMESPACE} make --no-print-directory feedback--url