From ec43d6519cf60cde9e628d78d76ea9b9643c5b6d Mon Sep 17 00:00:00 2001 From: evan Date: Fri, 2 May 2025 19:24:07 -0700 Subject: [PATCH] use timestamp for image tag, remove volume mounts when starting container --- deploy.sh | 6 +++--- update.sh | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/deploy.sh b/deploy.sh index 9baf950c6..105de6009 100755 --- a/deploy.sh +++ b/deploy.sh @@ -121,8 +121,8 @@ REMOTE_USER="openfront" REMOTE_UPDATE_PATH="/home/$REMOTE_USER" REMOTE_UPDATE_SCRIPT="$REMOTE_UPDATE_PATH/update-openfront.sh" # Where to place the script on server -IMAGE_NAME="${DOCKER_USERNAME}/${DOCKER_REPO}" -DOCKER_IMAGE="${IMAGE_NAME}:${VERSION_TAG}" +VERSION_TAG=$(date +"%Y%m%d-%H%M%S") +DOCKER_IMAGE="${DOCKER_USERNAME}/${DOCKER_REPO}:${VERSION_TAG}" # Check if update script exists if [ ! -f "$UPDATE_SCRIPT" ]; then @@ -145,7 +145,7 @@ echo "Git commit: $GIT_COMMIT" docker buildx build \ --platform linux/amd64 \ --build-arg GIT_COMMIT=$GIT_COMMIT \ - -t $DOCKER_USERNAME/$DOCKER_REPO:$VERSION_TAG \ + -t $DOCKER_IMAGE \ --push \ . diff --git a/update.sh b/update.sh index c483dbba0..97d57a451 100755 --- a/update.sh +++ b/update.sh @@ -42,7 +42,6 @@ fi echo "Starting new container for ${HOST} environment..." docker run -d \ --restart=always \ - $VOLUME_MOUNTS \ --env-file /home/openfront/.env \ --name ${CONTAINER_NAME} \ $DOCKER_IMAGE @@ -52,8 +51,8 @@ if [ $? -eq 0 ]; then # Final cleanup after successful deployment echo "Performing final cleanup of unused Docker resources..." - echo "Removing unused images (not tagged and not referenced)..." - docker image prune -f + echo "Removing unused images (not referenced)..." + docker image prune -a -f docker container prune -f echo "Cleanup complete." else