feat: Add push_dev option for development image in release workflow and update tag handling

.github/workflows/release-docker.yml

@@ -15,6 +15,14 @@ on:
           - patch
           - minor
           - development
+      push_dev:
+        description: "If true, push the :dev image to GHCR for development releases"
+        required: false
+        default: "false"
+        type: choice
+        options:
+          - "true"
+          - "false"
 
 permissions:
   contents: write
@@ -39,6 +47,7 @@ jobs:
           EVENT_NAME: ${{ github.event_name }}
           REF_NAME: ${{ github.ref_name }}
           BUMP_TYPE: ${{ github.event.inputs.bump || 'patch' }}
+          PUSH_DEV: ${{ github.event.inputs.push_dev || 'false' }}
         run: |
           if [ "$EVENT_NAME" = "push" ] && [ -n "$REF_NAME" ]; then
             TAG="$REF_NAME"
@@ -87,13 +96,17 @@ jobs:
             else:
               patch += 1
 
+            if bump == "development":
+              # use dev suffix for development releases
+              print(f"v{major}.{minor}.{patch}-dev")
+            else:
               print(f"v{major}.{minor}.{patch}")
             PY
             )"
           fi
 
-          if ! echo "$TAG" | grep -Eq '^v[0-9]+\.[0-9]+\.[0-9]+$'; then
+          if ! echo "$TAG" | grep -Eq '^v[0-9]+\.[0-9]+\.[0-9]+(-dev(\.[0-9]+)?)?$'; then
-            echo "Error: tag '$TAG' is not valid semver (vX.Y.Z)"
+            echo "Error: tag '$TAG' is not valid semver (vX.Y.Z or vX.Y.Z-dev)"
             exit 1
           fi
 
@@ -116,12 +129,15 @@ jobs:
             exit 1
           fi
 
-          while git rev-parse -q --verify "refs/tags/$TAG" >/dev/null; do
+          # Ensure tag uniqueness: if tag exists append numeric suffix
-            BASE="${TAG%.*}"
+          if git rev-parse -q --verify "refs/tags/$TAG" >/dev/null; then
-            PATCH="${TAG##*.}"
+            i=1
-            PATCH="$((PATCH + 1))"
+            base="$TAG"
-            TAG="$BASE.$PATCH"
+            while git rev-parse -q --verify "refs/tags/${base}.${i}" >/dev/null; do
+              i="$((i + 1))"
             done
+            TAG="${base}.${i}"
+          fi
 
           IMAGE="ghcr.io/aiirondev/legendary-octo-garbanzo:${TAG}"
           echo "tag=$TAG" >> "$GITHUB_OUTPUT"
@@ -131,9 +147,14 @@ jobs:
           else
             echo "is_development=false" >> "$GITHUB_OUTPUT"
           fi
+          if [ "${BUMP_TYPE:-}" = "development" ] && [ "${PUSH_DEV:-}" = "true" ]; then
+            echo "push_dev=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "push_dev=false" >> "$GITHUB_OUTPUT"
+          fi
 
       - name: Create and push tag for manual releases
-        if: github.event_name == 'workflow_dispatch' && steps.meta.outputs.is_development != 'true'
+        if: github.event_name == 'workflow_dispatch'
         run: |
           TAG="${{ steps.meta.outputs.tag }}"
           git config user.name "github-actions[bot]"
@@ -162,14 +183,15 @@ jobs:
             ${{ steps.meta.outputs.image }}
             ghcr.io/aiirondev/legendary-octo-garbanzo:latest
 
-      - name: Build and push development image
+      - name: Build and push development image (:dev)
+        if: steps.meta.outputs.is_development == 'true' && steps.meta.outputs.push_dev == 'true'
         uses: docker/build-push-action@v6
         with:
           context: .
           file: ./Dockerfile
           push: true
           tags: |
-            ghcr.io/aiirondev/legendary-octo-garbanzo:development
+            ghcr.io/aiirondev/legendary-octo-garbanzo:dev
 
       - name: Build local image tar for offline deploy
         run: |
@@ -196,23 +218,23 @@ jobs:
       - name: Build local development image tar for offline deploy
         run: |
           set -euo pipefail
-          DEV_IMG=ghcr.io/aiirondev/legendary-octo-garbanzo:development
+          DEV_IMG=ghcr.io/aiirondev/legendary-octo-garbanzo:dev
 
           if docker image inspect "$DEV_IMG" >/dev/null 2>&1; then
             echo "Using local development image $DEV_IMG"
-            docker save "$DEV_IMG" | gzip > "inventarsystem-image-development.tar.gz"
+            docker save "$DEV_IMG" | gzip > "inventarsystem-image-dev.tar.gz"
             exit 0
           fi
 
           echo "Local development image not found, trying to pull $DEV_IMG"
           if docker pull "$DEV_IMG" >/dev/null 2>&1; then
-            docker save "$DEV_IMG" | gzip > "inventarsystem-image-development.tar.gz"
+            docker save "$DEV_IMG" | gzip > "inventarsystem-image-dev.tar.gz"
             exit 0
           fi
 
           echo "Pull failed, attempting local docker build for development image"
           docker build -t "$DEV_IMG" .
-          docker save "$DEV_IMG" | gzip > "inventarsystem-image-development.tar.gz"
+          docker save "$DEV_IMG" | gzip > "inventarsystem-image-dev.tar.gz"
 
       - name: Create release-only docker bundle
         run: |
@@ -298,16 +320,16 @@ jobs:
           done
 
           # Include optional development image tar and helper note
-          if [ -f "inventarsystem-image-development.tar.gz" ]; then
+          if [ -f "inventarsystem-image-dev.tar.gz" ]; then
-            cp inventarsystem-image-development.tar.gz release-bundle/ || true
+            cp inventarsystem-image-dev.tar.gz release-bundle/ || true
           fi
 
           cat > release-bundle/DEVELOPMENT.md <<'EOF'
-          This bundle contains an optional development image tar: inventarsystem-image-development.tar.gz
+          This bundle contains an optional development image tar: inventarsystem-image-dev.tar.gz
                       
           To install the development build on a target host, extract the bundle and run:
           
-            ./update.sh development
+            ./update.sh dev
           
           EOF
 
@@ -316,13 +338,13 @@ jobs:
           tar -czf inventarsystem-docker-bundle.tar.gz -C release-bundle .
 
       - name: Create or update GitHub Release
-        if: steps.meta.outputs.is_development != 'true'
         uses: softprops/action-gh-release@v2
         with:
           tag_name: ${{ steps.meta.outputs.tag }}
+          prerelease: ${{ steps.meta.outputs.is_development }}
           files: |
             inventarsystem-docker-bundle.tar.gz
             inventarsystem-image-${{ steps.meta.outputs.tag }}.tar.gz
-            inventarsystem-image-development.tar.gz
+            inventarsystem-image-dev.tar.gz
           fail_on_unmatched_files: false
           generate_release_notes: true

update.sh

@@ -489,7 +489,7 @@ main() {
     # If user requested a development install, perform a simple dev deploy flow
     if [ "$MODE" = "development" ]; then
         log_message "Requested development install"
-        local tag="development"
+        local tag="dev"
         local app_image="$APP_IMAGE_REPO:$tag"
         local compose_path="$PROJECT_DIR/$COMPOSE_FILE"
 
@@ -523,7 +523,6 @@ EOF
         # Bring up stack
         docker compose -f "$compose_path" --env-file "$ENV_FILE" pull app mongodb >> "$LOG_FILE" 2>&1 || true
         docker compose -f "$compose_path" --env-file "$ENV_FILE" up -d --remove-orphans >> "$LOG_FILE" 2>&1
-        docker tag "$app_image" "$APP_IMAGE_REPO:latest" >> "$LOG_FILE" 2>&1 || true
 
         if ! verify_stack_health; then
             log_message "ERROR: Development deployment failed health check"