From 9e532d5d4fc1cb6c4495d2acb6e418fc98d46db2 Mon Sep 17 00:00:00 2001 From: Vezpi Date: Thu, 5 Jun 2025 08:48:46 +0000 Subject: [PATCH] add: remove old docker image --- .gitea/workflows/deployment.yml | 18 +++++++++++++++--- docker/entrypoint.sh | 2 ++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index 35601f3..989ca5f 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -18,6 +18,7 @@ jobs: latest_hugo_version: ${{ steps.get_latest.outputs.version }} current_hugo_version: ${{ steps.get_current.outputs.version }} newer_version_available: ${{ steps.compare.outputs.version }} + current_docker_image: ${{ steps.current_docker.outputs.image }} docker_folder_changed: ${{ steps.docker_folder.outputs.changed }} steps: - name: Checkout Repository @@ -48,6 +49,12 @@ jobs: fi echo "version=$new_version_available" | tee -a $GITEA_OUTPUT + - name: Get Current Docker Image ID + id: current_docker + run: | + current_image=$(docker image ls ${DOCKER_IMAGE}:latest --format '{{.ID}}' | head -n1) + echo "image=$current_image" | tee -a $GITEA_OUTPUT + - name: Check Changes in the Docker Folder id: docker_folder run: | @@ -182,11 +189,16 @@ jobs: - Check-Rebuild - Build - Test-Production - if: needs.Check-Rebuild.outputs.newer_version_available == 'true' runs-on: docker defaults: run: shell: sh steps: - - name: Checkout Repository - run: docker image rm vezpi-blog:${{ needs.Check-Rebuild.outputs.current_hugo_version }} --force \ No newline at end of file + # - name: Remove Old Docker Image + # if: needs.Check-Rebuild.outputs.newer_version_available == 'true' + # run: | + # docker image rm vezpi-blog:${{ needs.Check-Rebuild.outputs.current_hugo_version }} --force + + - name: Remove Old Docker Image + run: docker image rm {{ needs.Check-Rebuild.outputs.current_docker_image }} --force + \ No newline at end of file diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index 6dc3763..d07f65e 100644 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -14,6 +14,8 @@ if [ "$BRANCH" = "preview" ]; then DRAFTS="--buildDrafts" fi +#removeme + # Clone repo echo "- Cloning $REPO_URL (branch: $BRANCH)..." git clone --depth 1 --recurse-submodules --branch "$BRANCH" "$REPO_URL" "$CLONE_DIR"