marcusconsulting/docker-skeleton
2
0
Fork 0
Code Activity

Ubuntu 24.04 LTS conformance mods

Browse Source 
* docker-compose-v2 compatibility
* MySQL/MariaDB dual comaptibility
ACME client minor upgrade
This commit is contained in:
Kovács Zoltán
2024-08-24 19:46:03 +02:00
parent 47211a6ea8
commit 005d0503e2
7 changed files with 612 additions and 431 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
tools/build
View File

@ -8,6 +8,8 @@
# Author: Kovács Zoltán <kovacs.zoltan@smartfront.hu>
# Kovács Zoltán <kovacsz@marcusconsulting.hu>
# License: GNU/GPL v3+ (https://www.gnu.org/licenses/gpl-3.0.en.html)
# 2024-08-24 v1.1
# new: docker-compose v2 compatibility - tested with Ubuntu 24.04 LTS.
# 2023-06-18 v1.0
# new: forked from the "Smartfront's DOCKER_skeleton" repository.
# 2021-10-03 v0.2
@ -28,12 +30,28 @@ MSG_MISSINGYML="Fatal: didn't find the docker-compose.yml file"
# Checks the dependencies.
TR=$(which tr 2>/dev/null)
if [ -z "$TR" ]; then echo "$MSG_MISSINGDEP tr."; exit 1 ; fi
for item in dirname docker-compose readlink
for item in dirname docker readlink
do
if [ -n "$(which $item)" ]
then export $(echo $item | "$TR" '[:lower:]' '[:upper:]' | "$TR" '-' '_')=$(which $item)
else echo "$MSG_MISSINGDEP $item." >&2; exit 1; fi
done
#
# Let's find which version of docker-compose is installed.
commandstring=""
if [ $($DOCKER compose version 2>&1 >/dev/null; echo $?) -eq 0 ]; then
# We'll use v2 if it is available.
DOCKER_COMPOSE="$DOCKER"
commandstring="compose"
else
# Otherwise falling back to v1.
DOCKER_COMPOSE="$(which docker-compose)"
commandstring=""
fi
# One of the two is mandatory.
if [ -z "$DOCKER_COMPOSE" ];then echo "$MSG_MISSINGDEP docker-compose" >&2; exit 1; fi
# All dependencies are available via "$THECOMMAND" (upper case) call.
# In addition "docker-compose" should be called as "$DOCKER_COMPOSE" $commandstring.
# Where I'm?
# https://gist.github.com/TheMengzor/968e5ea87e99d9c41782
@ -64,10 +82,10 @@ if [ -z "$BASE_DIR" -o ! -r "$BASE_DIR/$YMLFILE" ]; then
fi
# Doesn't attempts to build if the service is running.
if [ -n "$(cd "$BASE_DIR"; "$DOCKER_COMPOSE" ps --services --filter "status=running")" ]; then
if [ -n "$(cd "$BASE_DIR"; "$DOCKER_COMPOSE" $commandstring ps --services --filter "status=running")" ]; then
echo "$MSG_ALREADYRUN" >&2; exit 1
fi
# Pulls the components and builds the service (if necessary).
(cd "$BASE_DIR"; "$DOCKER_COMPOSE" rm -f; "$DOCKER_COMPOSE" pull; "$DOCKER_COMPOSE" build)
(cd "$BASE_DIR"; "$DOCKER_COMPOSE" $commandstring rm -f; "$DOCKER_COMPOSE" $commandstring pull; "$DOCKER_COMPOSE" $commandstring build)
# That's all, Folks!