From 6d8ff752f59ad460d723eb6ee328aed2d4ac5bd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reinhard=20X=2E=20F=C3=BCrst?= Date: Sun, 3 May 2026 13:51:15 +0200 Subject: [PATCH] =?UTF-8?q?Tag=20image=20mit=20der=20Versionsnummer=20zus?= =?UTF-8?q?=C3=A4tzlich?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Copilot --- .gitignore | 3 +++ deploy.sh | 14 ++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 62693a9..fb03282 100644 --- a/.gitignore +++ b/.gitignore @@ -70,3 +70,6 @@ frontend/build/ # PostgreSQL Data postgres_data/ + +#Backups +backups/ diff --git a/deploy.sh b/deploy.sh index d59261d..bdeac83 100755 --- a/deploy.sh +++ b/deploy.sh @@ -12,8 +12,9 @@ PROJEKT="wetterstation" IMAGE_NAME=("${PROJEKT}-frontend" "${PROJEKT}-collector" "${PROJEKT}-api") TAG="${TAG:-$(date +%Y%m%d%H%M)}" # default Datum -# Build-Datum +# Build-Datum und Version BUILD_DATE=$(date +%d.%m.%Y) +VERSION=$(grep '"version"' frontend/package.json | head -1 | sed 's/.*"version": "\(.*\)".*/\1/') echo "==========================================" echo " Deploy Script" @@ -49,11 +50,7 @@ for image in "${IMAGE_NAME[@]}"; do echo "==========================================" # Build-Args vorbereiten (für Frontend Version und Build-Date) - BUILD_ARGS="--build-arg BUILD_DATE=${BUILD_DATE}" - if [ "${IMAGE_DIR}" = "frontend" ]; then - VERSION=$(grep '"version"' "${IMAGE_DIR}/package.json" | head -1 | sed 's/.*"version": "\(.*\)".*/\1/') - BUILD_ARGS="${BUILD_ARGS} --build-arg VERSION=${VERSION}" - fi + BUILD_ARGS="--build-arg BUILD_DATE=${BUILD_DATE} --build-arg VERSION=${VERSION}" # 3. Docker Image bauen und pushen (Multiplatform) docker buildx build \ @@ -63,9 +60,10 @@ for image in "${IMAGE_NAME[@]}"; do --push \ "./${IMAGE_DIR}" - # 4. Tagge auch als :latest - echo ">>> Tagge ${image} als :latest..." + # 4. Tagge auch als :${VERSION} und :latest + echo ">>> Tagge ${image} als :${VERSION} und :latest..." docker buildx imagetools create \ + -t "${REGISTRY}/${image}:${VERSION}" \ -t "${REGISTRY}/${image}:latest" \ "${FULL_IMAGE}"