From 5b283c6fe45a11f8890cdb2661a801c7888bd42a Mon Sep 17 00:00:00 2001
From: Michael Taylor <mtaylor@michaeltaylor.dev>
Date: Mon, 9 Sep 2024 09:30:01 -0400
Subject: [PATCH 1/2] chore(release): bump version to 0.0.1-alpha.2

---
 .github/workflows/build.yaml     | 25 ++++++++++++++++++++-----
 release.sh => scripts/release.sh | 16 ++++++++--------
 2 files changed, 28 insertions(+), 13 deletions(-)
 rename release.sh => scripts/release.sh (71%)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index d47b4de..2082883 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -29,10 +29,25 @@ jobs:
       - name: Build Project
         run: npm run build
 
+      - name: Extract Project Name
+        id: project-name
+        run: |
+          PROJECT_NAME=$(jq -r '.name' package.json)
+          echo "PROJECT_NAME=$PROJECT_NAME" >> $GITHUB_ENV
+
       - name: Get tag name
         id: tag-name
         run: |
-          echo "TAGNAME=$(echo $GITHUB_REF | cut -d / -f 3)" >> $GITHUB_OUTPUT
+          TAGNAME=$(echo $GITHUB_REF | cut -d / -f 3)
+          echo "TAGNAME=$TAGNAME" >> $GITHUB_ENV
+
+      - name: Determine Docker Tag
+        id: docker-tag
+        run: |
+          if [[ "$TAGNAME" == *"alpha"* ]]; then
+            echo "DOCKER_TAG=latest-alpha" >> $GITHUB_ENV
+          else
+            echo "DOCKER_TAG=latest" >> $GITHUB_ENV
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
@@ -45,7 +60,7 @@ jobs:
 
       - name: Build and Push Docker Image
         run: |
-          docker build -t ${{ vars.DOCKER_NAMESPACE }}/dig-content-server:latest .
-          docker tag ${{ vars.DOCKER_NAMESPACE }}/dig-content-server:latest ${{ vars.DOCKER_NAMESPACE }}/dig-content-server:${{ steps.tag-name.outputs.TAGNAME }}
-          docker push ${{ vars.DOCKER_NAMESPACE }}/dig-content-server:latest
-          docker push ${{ vars.DOCKER_NAMESPACE }}/dig-content-server:${{ steps.tag-name.outputs.TAGNAME }}
+          docker build -t ${{ vars.DOCKER_NAMESPACE }}/${{ env.PROJECT_NAME }}:${{ env.DOCKER_TAG }} .
+          docker tag ${{ vars.DOCKER_NAMESPACE }}/${{ env.PROJECT_NAME }}:${{ env.DOCKER_TAG }} ${{ vars.DOCKER_NAMESPACE }}/${{ env.PROJECT_NAME }}:${{ steps.tag-name.outputs.TAGNAME }}
+          docker push ${{ vars.DOCKER_NAMESPACE }}/${{ env.PROJECT_NAME }}:${{ env.DOCKER_TAG }}
+          docker push ${{ vars.DOCKER_NAMESPACE }}/${{ env.PROJECT_NAME }}:${{ steps.tag-name.outputs.TAGNAME }}
diff --git a/release.sh b/scripts/release.sh
similarity index 71%
rename from release.sh
rename to scripts/release.sh
index efa574f..fd428cc 100644
--- a/release.sh
+++ b/scripts/release.sh
@@ -7,19 +7,19 @@ if [ "$CURRENT_BRANCH" != "develop" ]; then
   exit 1
 fi
 
-# Extract the current version from package.json
-VERSION=$(jq -r '.version' package.json)
-
-# Create a new feature branch based on the version
-FEATURE_BRANCH="release/v$VERSION"
-git checkout -b "$FEATURE_BRANCH"
-
 # Run standard-version for version bumping
 npx standard-version --prerelease alpha
 
+# Extract the new version from package.json after bumping
+NEW_VERSION=$(jq -r '.version' package.json)
+
+# Create a new feature branch based on the new version
+FEATURE_BRANCH="release/v$NEW_VERSION"
+git checkout -b "$FEATURE_BRANCH"
+
 # Commit changes
 git add .
-git commit -m "chore(release): bump version to $VERSION"
+git commit -m "chore(release): bump version to $NEW_VERSION"
 
 # Notify the user about the feature branch
 echo "Version bumped and committed on branch $FEATURE_BRANCH."

From 7f38ad15a1e8bf08ffa1b93284f6eed5eeb8b7a1 Mon Sep 17 00:00:00 2001
From: Michael Taylor <mtaylor@michaeltaylor.dev>
Date: Mon, 9 Sep 2024 09:54:51 -0400
Subject: [PATCH 2/2] chore(release): 0.0.1-alpha.4

---
 CHANGELOG.md      | 2 ++
 package-lock.json | 4 ++--
 package.json      | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e85b071..f58bc24 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [0.0.1-alpha.4](https://github.com/DIG-Network/dig-content-server/compare/v0.0.1-alpha.3...v0.0.1-alpha.4) (2024-09-09)
+
 ### [0.0.1-alpha.3](https://github.com/DIG-Network/dig-content-server/compare/v0.0.1...v0.0.1-alpha.3) (2024-09-09)
 
 ### 0.0.1 (2024-09-09)
diff --git a/package-lock.json b/package-lock.json
index bce9aae..54b8896 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "dig-cli",
-  "version": "0.0.1-alpha.3",
+  "version": "0.0.1-alpha.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "dig-cli",
-      "version": "0.0.1-alpha.3",
+      "version": "0.0.1-alpha.4",
       "license": "ISC",
       "dependencies": {
         "async-mutex": "^0.5.0",
diff --git a/package.json b/package.json
index bfbd534..1a228d2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dig-cli",
-  "version": "0.0.1-alpha.3",
+  "version": "0.0.1-alpha.4",
   "description": "",
   "type": "commonjs",
   "main": "./dist/index.js",