From cca8a9157c8ff3674034a2476868a4e134895a8d Mon Sep 17 00:00:00 2001
From: Stan Brubaker <120737309+stanbrub@users.noreply.github.com>
Date: Fri, 9 Aug 2024 16:32:34 -0600
Subject: [PATCH 01/37] Adde COMMIT_HASH

---
 .github/workflows/branch-ci.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/branch-ci.yml b/.github/workflows/branch-ci.yml
index 406c213..9ae53fa 100644
--- a/.github/workflows/branch-ci.yml
+++ b/.github/workflows/branch-ci.yml
@@ -34,7 +34,9 @@ jobs:
           java-version: '11'
 
       - name: Set JAVA_HOME
-        run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
+        run: |
+          echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
+          echo "COMMIT_HASH=${{ GITHUB_SHA }} " >> $GITHUB_OUTPUT
 
       - name: Setup gradle properties
         run: |
@@ -110,4 +112,5 @@ jobs:
           MULTI_ARCH: true
           RELEASE: true
           REPO_PREFIX: ghcr.io/${{ github.repository_owner }}/
+          COMMIT_HASH: ${{ needs.assemble-deephaven-core.outputs.COMMIT_HASH }}
           TAG: ${{ github.event.inputs.image_tag }}

From 983e9e15eee2f153abf8ea87f0f103ba9b2ec1e3 Mon Sep 17 00:00:00 2001
From: Stan Brubaker <120737309+stanbrub@users.noreply.github.com>
Date: Fri, 9 Aug 2024 16:47:38 -0600
Subject: [PATCH 02/37] Add COMMIT_HASH to Dockerfile

---
 contexts/server/Dockerfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/contexts/server/Dockerfile b/contexts/server/Dockerfile
index f86366f..dcae89c 100644
--- a/contexts/server/Dockerfile
+++ b/contexts/server/Dockerfile
@@ -3,6 +3,7 @@
 ARG OPENJDK_VERSION
 ARG UBUNTU_VERSION
 ARG DEEPHAVEN_SOURCES
+ARG COMMIT_HASH
 
 # -------------------------------------
 
@@ -60,7 +61,8 @@ RUN \
 ENV \
     LANG='en_US.UTF-8' \
     LANGUAGE='en_US:en' \
-    LC_ALL='en_US.UTF-8'
+    LC_ALL='en_US.UTF-8' \
+    COMMIT_HASH=${COMMIT_HASH}
 LABEL \
     io.deephaven.server.ubuntu.version="${UBUNTU_VERSION}" \
     org.opencontainers.image.vendor="Deephaven Data Labs" \

From 61edec8a4be1531c91e67d54feca82fb9e329a50 Mon Sep 17 00:00:00 2001
From: Stan Brubaker <120737309+stanbrub@users.noreply.github.com>
Date: Fri, 9 Aug 2024 16:50:23 -0600
Subject: [PATCH 03/37] Update server.hcl

---
 server.hcl | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/server.hcl b/server.hcl
index 8a202ab..e4d5a19 100644
--- a/server.hcl
+++ b/server.hcl
@@ -47,6 +47,10 @@ variable "OPENJDK_VERSION" {
     default = "21"
 }
 
+variable "COMMIT_HASH" {
+    default = "not-set"
+}
+
 variable "PYTHON_VERSION" {
     default = "3.10"
 }

From be65938e4bbea74e3ce9974753699efc877e9c26 Mon Sep 17 00:00:00 2001
From: Stan Brubaker <120737309+stanbrub@users.noreply.github.com>
Date: Fri, 9 Aug 2024 17:04:46 -0600
Subject: [PATCH 04/37] Use github.sha variable instead of env

---
 .github/workflows/branch-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/branch-ci.yml b/.github/workflows/branch-ci.yml
index 9ae53fa..8d54bc7 100644
--- a/.github/workflows/branch-ci.yml
+++ b/.github/workflows/branch-ci.yml
@@ -36,7 +36,7 @@ jobs:
       - name: Set JAVA_HOME
         run: |
           echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
-          echo "COMMIT_HASH=${{ GITHUB_SHA }} " >> $GITHUB_OUTPUT
+          echo "COMMIT_HASH=${{ github.sha }} " >> $GITHUB_OUTPUT
 
       - name: Setup gradle properties
         run: |

From 168d6e1535a3ce523ceb0af865073a23530a0f32 Mon Sep 17 00:00:00 2001
From: Stan Brubaker <120737309+stanbrub@users.noreply.github.com>
Date: Fri, 9 Aug 2024 17:29:01 -0600
Subject: [PATCH 05/37] Update server.hcl

---
 server.hcl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server.hcl b/server.hcl
index e4d5a19..9eb8346 100644
--- a/server.hcl
+++ b/server.hcl
@@ -175,6 +175,7 @@ target "server-context" {
         DEEPHAVEN_VERSION = DEEPHAVEN_VERSION
         DEEPHAVEN_CORE_WHEEL = DEEPHAVEN_CORE_WHEEL
         OPENJDK_VERSION = OPENJDK_VERSION
+        COMMIT_HASH = COMMIT_HASH
         PYTHON_VERSION = PYTHON_VERSION
         UBUNTU_VERSION = UBUNTU_VERSION
         GRPC_HEALTH_PROBE_VERSION = GRPC_HEALTH_PROBE_VERSION

From 954cff079eb412639d94fafb08c0cdf9c1f30300 Mon Sep 17 00:00:00 2001
From: Stan Brubaker <120737309+stanbrub@users.noreply.github.com>
Date: Fri, 9 Aug 2024 17:57:19 -0600
Subject: [PATCH 06/37] Update branch-ci.yml

---
 .github/workflows/branch-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/branch-ci.yml b/.github/workflows/branch-ci.yml
index 8d54bc7..7f6a2aa 100644
--- a/.github/workflows/branch-ci.yml
+++ b/.github/workflows/branch-ci.yml
@@ -36,7 +36,7 @@ jobs:
       - name: Set JAVA_HOME
         run: |
           echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
-          echo "COMMIT_HASH=${{ github.sha }} " >> $GITHUB_OUTPUT
+          echo "COMMIT_HASH="$(git rev-parse HEAD) >> $GITHUB_OUTPUT
 
       - name: Setup gradle properties
         run: |

From 94d2044df908824643718726ff1d5e5968d526cb Mon Sep 17 00:00:00 2001
From: Stan Brubaker <120737309+stanbrub@users.noreply.github.com>
Date: Fri, 9 Aug 2024 18:05:53 -0600
Subject: [PATCH 07/37] Update branch-ci.yml

---
 .github/workflows/branch-ci.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/branch-ci.yml b/.github/workflows/branch-ci.yml
index 7f6a2aa..22d163d 100644
--- a/.github/workflows/branch-ci.yml
+++ b/.github/workflows/branch-ci.yml
@@ -19,6 +19,8 @@ concurrency: release
 jobs:
   assemble-deephaven-core:
     runs-on: ubuntu-24.04
+    outputs:
+      commit-hash: ${{ steps.set-java-home.outputs.COMMIT_HASH }}
     steps:
       - name: Checkout deephaven-core
         uses: actions/checkout@v4
@@ -34,6 +36,7 @@ jobs:
           java-version: '11'
 
       - name: Set JAVA_HOME
+        id: set-java-home
         run: |
           echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
           echo "COMMIT_HASH="$(git rev-parse HEAD) >> $GITHUB_OUTPUT
@@ -112,5 +115,5 @@ jobs:
           MULTI_ARCH: true
           RELEASE: true
           REPO_PREFIX: ghcr.io/${{ github.repository_owner }}/
-          COMMIT_HASH: ${{ needs.assemble-deephaven-core.outputs.COMMIT_HASH }}
+          COMMIT_HASH: ${{ needs.assemble-deephaven-core.outputs.commit-hash }}
           TAG: ${{ github.event.inputs.image_tag }}

From 20015d55b15c67c2b5dead13db94e6339ed30cde Mon Sep 17 00:00:00 2001
From: Stan Brubaker <120737309+stanbrub@users.noreply.github.com>
Date: Fri, 9 Aug 2024 18:35:07 -0600
Subject: [PATCH 08/37] Update Dockerfile

---
 contexts/server/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contexts/server/Dockerfile b/contexts/server/Dockerfile
index dcae89c..127e449 100644
--- a/contexts/server/Dockerfile
+++ b/contexts/server/Dockerfile
@@ -41,6 +41,7 @@ FROM docker.io/ubuntu:${UBUNTU_VERSION} as os-bits
 ARG DEBIAN_FRONTEND="noninteractive"
 ARG TARGETARCH
 ARG UBUNTU_VERSION
+ARG COMMIT_HASH
 RUN \
     --mount=type=cache,target=/var/cache/apt,sharing=locked,id=apt-${TARGETARCH}-${UBUNTU_VERSION} \
     --mount=type=cache,target=/var/lib/apt,sharing=locked,id=apt-${TARGETARCH}-${UBUNTU_VERSION} \

From 8dddb88d49c7231f1a956cb51e508dbe989678e0 Mon Sep 17 00:00:00 2001
From: Stan Brubaker <120737309+stanbrub@users.noreply.github.com>
Date: Mon, 12 Aug 2024 17:18:33 -0600
Subject: [PATCH 09/37] Moved commit hash to LABEL

---
 contexts/server/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contexts/server/Dockerfile b/contexts/server/Dockerfile
index 127e449..68789fa 100644
--- a/contexts/server/Dockerfile
+++ b/contexts/server/Dockerfile
@@ -63,9 +63,9 @@ ENV \
     LANG='en_US.UTF-8' \
     LANGUAGE='en_US:en' \
     LC_ALL='en_US.UTF-8' \
-    COMMIT_HASH=${COMMIT_HASH}
 LABEL \
     io.deephaven.server.ubuntu.version="${UBUNTU_VERSION}" \
+    org.opencontainers.image.revision="${COMMIT_HASH}" \
     org.opencontainers.image.vendor="Deephaven Data Labs" \
     org.opencontainers.image.licenses="Deephaven Community License Agreement 1.0" \
     org.opencontainers.image.authors="developers@deephaven.io" \

From 666de367e9fb002cec1ea99c468c0cfd954527a1 Mon Sep 17 00:00:00 2001
From: Stan Brubaker <120737309+stanbrub@users.noreply.github.com>
Date: Mon, 12 Aug 2024 17:33:44 -0600
Subject: [PATCH 10/37] Update Dockerfile

---
 contexts/server/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contexts/server/Dockerfile b/contexts/server/Dockerfile
index 68789fa..2924a0e 100644
--- a/contexts/server/Dockerfile
+++ b/contexts/server/Dockerfile
@@ -62,7 +62,7 @@ RUN \
 ENV \
     LANG='en_US.UTF-8' \
     LANGUAGE='en_US:en' \
-    LC_ALL='en_US.UTF-8' \
+    LC_ALL='en_US.UTF-8'
 LABEL \
     io.deephaven.server.ubuntu.version="${UBUNTU_VERSION}" \
     org.opencontainers.image.revision="${COMMIT_HASH}" \

From ecd655604df188f96f0441e55015b3a45d87246d Mon Sep 17 00:00:00 2001
From: Stan Brubaker <120737309+stanbrub@users.noreply.github.com>
Date: Mon, 12 Aug 2024 17:59:30 -0600
Subject: [PATCH 11/37] Update Dockerfile

---
 contexts/server/Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/contexts/server/Dockerfile b/contexts/server/Dockerfile
index 2924a0e..ab1c489 100644
--- a/contexts/server/Dockerfile
+++ b/contexts/server/Dockerfile
@@ -62,7 +62,8 @@ RUN \
 ENV \
     LANG='en_US.UTF-8' \
     LANGUAGE='en_US:en' \
-    LC_ALL='en_US.UTF-8'
+    LC_ALL='en_US.UTF-8' \
+    COMMIT_HASH="${COMMIT_HASH}"
 LABEL \
     io.deephaven.server.ubuntu.version="${UBUNTU_VERSION}" \
     org.opencontainers.image.revision="${COMMIT_HASH}" \

From 54373e79baa2a6b5254c48b67da65fc1e24cbb18 Mon Sep 17 00:00:00 2001
From: Stan Brubaker <120737309+stanbrub@users.noreply.github.com>
Date: Mon, 12 Aug 2024 18:00:08 -0600
Subject: [PATCH 12/37] Update Dockerfile

---
 contexts/server/Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/contexts/server/Dockerfile b/contexts/server/Dockerfile
index ab1c489..2924a0e 100644
--- a/contexts/server/Dockerfile
+++ b/contexts/server/Dockerfile
@@ -62,8 +62,7 @@ RUN \
 ENV \
     LANG='en_US.UTF-8' \
     LANGUAGE='en_US:en' \
-    LC_ALL='en_US.UTF-8' \
-    COMMIT_HASH="${COMMIT_HASH}"
+    LC_ALL='en_US.UTF-8'
 LABEL \
     io.deephaven.server.ubuntu.version="${UBUNTU_VERSION}" \
     org.opencontainers.image.revision="${COMMIT_HASH}" \

From b07a5577c1bf7cf4a76129d0eda9e2876617ecb0 Mon Sep 17 00:00:00 2001
From: Stan Brubaker <120737309+stanbrub@users.noreply.github.com>
Date: Mon, 12 Aug 2024 19:31:51 -0600
Subject: [PATCH 13/37] Update edge-ci.yml similar to branch-ci.yml changes

---
 .github/workflows/edge-ci.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/edge-ci.yml b/.github/workflows/edge-ci.yml
index 6166ee2..9a92a08 100644
--- a/.github/workflows/edge-ci.yml
+++ b/.github/workflows/edge-ci.yml
@@ -18,6 +18,8 @@ jobs:
     if: ${{ github.repository_owner == 'deephaven' || github.event_name != 'schedule' }}
 
     runs-on: ubuntu-24.04
+    outputs:
+      commit-hash: ${{ steps.set-java-home.outputs.COMMIT_HASH }}
     steps:
       - name: Checkout deephaven-core
         uses: actions/checkout@v4
@@ -32,7 +34,10 @@ jobs:
           java-version: '11'
 
       - name: Set JAVA_HOME
-        run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
+        id: set-java-home
+        run: |
+          echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
+          echo "COMMIT_HASH="$(git rev-parse HEAD) >> $GITHUB_OUTPUT
 
       - name: Setup gradle properties
         run: |
@@ -109,4 +114,5 @@ jobs:
           MULTI_ARCH: true
           RELEASE: ${{ github.event_name != 'pull_request' }}
           REPO_PREFIX: ghcr.io/${{ github.repository_owner }}/
+          COMMIT_HASH: ${{ needs.assemble-deephaven-core.outputs.commit-hash }}
           TAG: edge

From bc57420aeb48e29f1dab3f1c0684d250528f641c Mon Sep 17 00:00:00 2001
From: Stan Brubaker <120737309+stanbrub@users.noreply.github.com>
Date: Mon, 12 Aug 2024 21:26:47 -0600
Subject: [PATCH 14/37] Update Dockerfile

---
 contexts/server-slim/Dockerfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/contexts/server-slim/Dockerfile b/contexts/server-slim/Dockerfile
index 5ef9a59..5b6b92a 100644
--- a/contexts/server-slim/Dockerfile
+++ b/contexts/server-slim/Dockerfile
@@ -3,6 +3,7 @@
 ARG OPENJDK_VERSION
 ARG UBUNTU_VERSION
 ARG DEEPHAVEN_SOURCES
+ARG COMMIT_HASH
 
 # -------------------------------------
 
@@ -40,6 +41,7 @@ FROM docker.io/ubuntu:${UBUNTU_VERSION} as os-bits
 ARG DEBIAN_FRONTEND="noninteractive"
 ARG TARGETARCH
 ARG UBUNTU_VERSION
+ARG COMMIT_HASH
 RUN \
     --mount=type=cache,target=/var/cache/apt,sharing=locked,id=apt-${TARGETARCH}-${UBUNTU_VERSION} \
     --mount=type=cache,target=/var/lib/apt,sharing=locked,id=apt-${TARGETARCH}-${UBUNTU_VERSION} \
@@ -63,6 +65,7 @@ ENV \
     LC_ALL='en_US.UTF-8'
 LABEL \
     io.deephaven.server.ubuntu.version="${UBUNTU_VERSION}" \
+    org.opencontainers.image.revision="${COMMIT_HASH}" \
     org.opencontainers.image.vendor="Deephaven Data Labs" \
     org.opencontainers.image.licenses="Deephaven Community License Agreement 1.0" \
     org.opencontainers.image.authors="developers@deephaven.io" \

From ad5aecb139d58b55e1a9482844bc0b4c564bd79b Mon Sep 17 00:00:00 2001
From: Stan Brubaker <120737309+stanbrub@users.noreply.github.com>
Date: Mon, 12 Aug 2024 21:28:36 -0600
Subject: [PATCH 15/37] Update server-slim.hcl

---
 server-slim.hcl | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/server-slim.hcl b/server-slim.hcl
index 57e6f44..7db0039 100644
--- a/server-slim.hcl
+++ b/server-slim.hcl
@@ -32,6 +32,10 @@ variable "OPENJDK_VERSION" {
     default = "21"
 }
 
+variable "COMMIT_HASH" {
+    default = "not-set"
+}
+
 variable "UBUNTU_VERSION" {
     default = "22.04"
 }
@@ -74,6 +78,7 @@ target "server-slim" {
     args = {
         DEEPHAVEN_VERSION = DEEPHAVEN_VERSION
         OPENJDK_VERSION = OPENJDK_VERSION
+        COMMIT_HASH = COMMIT_HASH
         UBUNTU_VERSION = UBUNTU_VERSION
         GRPC_HEALTH_PROBE_VERSION = GRPC_HEALTH_PROBE_VERSION
         DEEPHAVEN_SOURCES = DEEPHAVEN_SOURCES

From 557dcb1aabbc911c555a031ceaef800826661a89 Mon Sep 17 00:00:00 2001
From: Stan Brubaker <120737309+stanbrub@users.noreply.github.com>
Date: Tue, 13 Aug 2024 10:56:01 -0600
Subject: [PATCH 16/37] Change COMMIT-HASH to GIT_REVISION

---
 .github/workflows/branch-ci.yml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/branch-ci.yml b/.github/workflows/branch-ci.yml
index 22d163d..6d23dbf 100644
--- a/.github/workflows/branch-ci.yml
+++ b/.github/workflows/branch-ci.yml
@@ -20,7 +20,7 @@ jobs:
   assemble-deephaven-core:
     runs-on: ubuntu-24.04
     outputs:
-      commit-hash: ${{ steps.set-java-home.outputs.COMMIT_HASH }}
+      git-revision: ${{ steps.get-git-revision.outputs.GIT_REVISION }}
     steps:
       - name: Checkout deephaven-core
         uses: actions/checkout@v4
@@ -28,6 +28,10 @@ jobs:
           repository: deephaven/deephaven-core
           ref: ${{ github.event.inputs.deephaven_core_ref }}
 
+      - name: Get GIT Revision
+        id: get-git-revision
+        run: echo "GIT_REVISION="$(git rev-parse HEAD) >> $GITHUB_OUTPUT
+
       - name: Setup JDK 11
         id: setup-java-11
         uses: actions/setup-java@v4
@@ -36,10 +40,7 @@ jobs:
           java-version: '11'
 
       - name: Set JAVA_HOME
-        id: set-java-home
-        run: |
-          echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
-          echo "COMMIT_HASH="$(git rev-parse HEAD) >> $GITHUB_OUTPUT
+        run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
 
       - name: Setup gradle properties
         run: |
@@ -115,5 +116,5 @@ jobs:
           MULTI_ARCH: true
           RELEASE: true
           REPO_PREFIX: ghcr.io/${{ github.repository_owner }}/
-          COMMIT_HASH: ${{ needs.assemble-deephaven-core.outputs.commit-hash }}
+          GIT_REVISION: ${{ needs.assemble-deephaven-core.outputs.git-revision }}
           TAG: ${{ github.event.inputs.image_tag }}

From 3c349a8ec30b7f1de4018961935dc1888146b8fe Mon Sep 17 00:00:00 2001
From: Stan Brubaker <120737309+stanbrub@users.noreply.github.com>
Date: Tue, 13 Aug 2024 11:27:20 -0600
Subject: [PATCH 17/37] Update edge-ci.yml

---
 .github/workflows/edge-ci.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/edge-ci.yml b/.github/workflows/edge-ci.yml
index 9a92a08..d71e3d7 100644
--- a/.github/workflows/edge-ci.yml
+++ b/.github/workflows/edge-ci.yml
@@ -19,13 +19,17 @@ jobs:
 
     runs-on: ubuntu-24.04
     outputs:
-      commit-hash: ${{ steps.set-java-home.outputs.COMMIT_HASH }}
+      git-revision: ${{ steps.get-git-revision.outputs.GIT_REVISION }}
     steps:
       - name: Checkout deephaven-core
         uses: actions/checkout@v4
         with:
           repository: deephaven/deephaven-core
 
+      - name: Get GIT Revision
+        id: get-git-revision
+        run: echo "GIT_REVISION="$(git rev-parse HEAD) >> $GITHUB_OUTPUT
+
       - name: Setup JDK 11
         id: setup-java-11
         uses: actions/setup-java@v4
@@ -34,11 +38,8 @@ jobs:
           java-version: '11'
 
       - name: Set JAVA_HOME
-        id: set-java-home
-        run: |
-          echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
-          echo "COMMIT_HASH="$(git rev-parse HEAD) >> $GITHUB_OUTPUT
-
+        run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
+        
       - name: Setup gradle properties
         run: |
           .github/scripts/gradle-properties.sh >> gradle.properties
@@ -114,5 +115,5 @@ jobs:
           MULTI_ARCH: true
           RELEASE: ${{ github.event_name != 'pull_request' }}
           REPO_PREFIX: ghcr.io/${{ github.repository_owner }}/
-          COMMIT_HASH: ${{ needs.assemble-deephaven-core.outputs.commit-hash }}
+          GIT_REVISION: ${{ needs.assemble-deephaven-core.outputs.git-revision }}
           TAG: edge

From 9f2c830b338907d1fd13901c9fc7290f9afd2c9d Mon Sep 17 00:00:00 2001
From: Stan Brubaker <120737309+stanbrub@users.noreply.github.com>
Date: Tue, 13 Aug 2024 11:28:14 -0600
Subject: [PATCH 18/37] Update server.hcl

---
 server.hcl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server.hcl b/server.hcl
index 9eb8346..0c97442 100644
--- a/server.hcl
+++ b/server.hcl
@@ -47,7 +47,7 @@ variable "OPENJDK_VERSION" {
     default = "21"
 }
 
-variable "COMMIT_HASH" {
+variable "GIT_REVISION" {
     default = "not-set"
 }
 
@@ -175,7 +175,7 @@ target "server-context" {
         DEEPHAVEN_VERSION = DEEPHAVEN_VERSION
         DEEPHAVEN_CORE_WHEEL = DEEPHAVEN_CORE_WHEEL
         OPENJDK_VERSION = OPENJDK_VERSION
-        COMMIT_HASH = COMMIT_HASH
+        GIT_REVISION = GIT_REVISION
         PYTHON_VERSION = PYTHON_VERSION
         UBUNTU_VERSION = UBUNTU_VERSION
         GRPC_HEALTH_PROBE_VERSION = GRPC_HEALTH_PROBE_VERSION

From a96079029e7abccd71c0b4cfc3e6cc081356aa49 Mon Sep 17 00:00:00 2001
From: Stan Brubaker <120737309+stanbrub@users.noreply.github.com>
Date: Tue, 13 Aug 2024 11:29:04 -0600
Subject: [PATCH 19/37] Update server-slim.hcl

---
 server-slim.hcl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server-slim.hcl b/server-slim.hcl
index 7db0039..f08f258 100644
--- a/server-slim.hcl
+++ b/server-slim.hcl
@@ -32,7 +32,7 @@ variable "OPENJDK_VERSION" {
     default = "21"
 }
 
-variable "COMMIT_HASH" {
+variable "GIT_REVISION" {
     default = "not-set"
 }
 
@@ -78,7 +78,7 @@ target "server-slim" {
     args = {
         DEEPHAVEN_VERSION = DEEPHAVEN_VERSION
         OPENJDK_VERSION = OPENJDK_VERSION
-        COMMIT_HASH = COMMIT_HASH
+        GIT_REVISION = GIT_REVISION
         UBUNTU_VERSION = UBUNTU_VERSION
         GRPC_HEALTH_PROBE_VERSION = GRPC_HEALTH_PROBE_VERSION
         DEEPHAVEN_SOURCES = DEEPHAVEN_SOURCES

From b6dfb3b81c43bd9d917a0b08c87a16d4da3ba1eb Mon Sep 17 00:00:00 2001
From: Stan Brubaker <120737309+stanbrub@users.noreply.github.com>
Date: Tue, 13 Aug 2024 11:30:05 -0600
Subject: [PATCH 20/37] Update Dockerfile

---
 contexts/server/Dockerfile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/contexts/server/Dockerfile b/contexts/server/Dockerfile
index 2924a0e..51d8d2d 100644
--- a/contexts/server/Dockerfile
+++ b/contexts/server/Dockerfile
@@ -3,7 +3,6 @@
 ARG OPENJDK_VERSION
 ARG UBUNTU_VERSION
 ARG DEEPHAVEN_SOURCES
-ARG COMMIT_HASH
 
 # -------------------------------------
 
@@ -41,7 +40,7 @@ FROM docker.io/ubuntu:${UBUNTU_VERSION} as os-bits
 ARG DEBIAN_FRONTEND="noninteractive"
 ARG TARGETARCH
 ARG UBUNTU_VERSION
-ARG COMMIT_HASH
+ARG GIT_REVISION
 RUN \
     --mount=type=cache,target=/var/cache/apt,sharing=locked,id=apt-${TARGETARCH}-${UBUNTU_VERSION} \
     --mount=type=cache,target=/var/lib/apt,sharing=locked,id=apt-${TARGETARCH}-${UBUNTU_VERSION} \
@@ -65,7 +64,7 @@ ENV \
     LC_ALL='en_US.UTF-8'
 LABEL \
     io.deephaven.server.ubuntu.version="${UBUNTU_VERSION}" \
-    org.opencontainers.image.revision="${COMMIT_HASH}" \
+    org.opencontainers.image.revision="${GIT_REVISION}" \
     org.opencontainers.image.vendor="Deephaven Data Labs" \
     org.opencontainers.image.licenses="Deephaven Community License Agreement 1.0" \
     org.opencontainers.image.authors="developers@deephaven.io" \

From 991330a09e2cf466bbcc3ea831d60246d51693f6 Mon Sep 17 00:00:00 2001
From: Stan Brubaker <120737309+stanbrub@users.noreply.github.com>
Date: Tue, 13 Aug 2024 11:33:35 -0600
Subject: [PATCH 21/37] Update Dockerfile

---
 contexts/server-slim/Dockerfile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/contexts/server-slim/Dockerfile b/contexts/server-slim/Dockerfile
index 5b6b92a..63024af 100644
--- a/contexts/server-slim/Dockerfile
+++ b/contexts/server-slim/Dockerfile
@@ -3,7 +3,6 @@
 ARG OPENJDK_VERSION
 ARG UBUNTU_VERSION
 ARG DEEPHAVEN_SOURCES
-ARG COMMIT_HASH
 
 # -------------------------------------
 
@@ -41,7 +40,7 @@ FROM docker.io/ubuntu:${UBUNTU_VERSION} as os-bits
 ARG DEBIAN_FRONTEND="noninteractive"
 ARG TARGETARCH
 ARG UBUNTU_VERSION
-ARG COMMIT_HASH
+ARG GIT_REVISION
 RUN \
     --mount=type=cache,target=/var/cache/apt,sharing=locked,id=apt-${TARGETARCH}-${UBUNTU_VERSION} \
     --mount=type=cache,target=/var/lib/apt,sharing=locked,id=apt-${TARGETARCH}-${UBUNTU_VERSION} \
@@ -65,7 +64,7 @@ ENV \
     LC_ALL='en_US.UTF-8'
 LABEL \
     io.deephaven.server.ubuntu.version="${UBUNTU_VERSION}" \
-    org.opencontainers.image.revision="${COMMIT_HASH}" \
+    org.opencontainers.image.revision="${GIT_REVISION}" \
     org.opencontainers.image.vendor="Deephaven Data Labs" \
     org.opencontainers.image.licenses="Deephaven Community License Agreement 1.0" \
     org.opencontainers.image.authors="developers@deephaven.io" \

From 4ee94c81eba0483cec2c16627cde2ad044ba8205 Mon Sep 17 00:00:00 2001
From: Stan Brubaker <120737309+stanbrub@users.noreply.github.com>
Date: Thu, 15 Aug 2024 12:29:09 -0600
Subject: [PATCH 22/37] Update server.hcl

---
 server.hcl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server.hcl b/server.hcl
index 0c97442..8126d70 100644
--- a/server.hcl
+++ b/server.hcl
@@ -48,7 +48,7 @@ variable "OPENJDK_VERSION" {
 }
 
 variable "GIT_REVISION" {
-    default = "not-set"
+    default = ""
 }
 
 variable "PYTHON_VERSION" {

From f141daeecf962b8a8eb7296f35685e61bad34942 Mon Sep 17 00:00:00 2001
From: Stan Brubaker <120737309+stanbrub@users.noreply.github.com>
Date: Mon, 19 Aug 2024 12:40:51 -0600
Subject: [PATCH 23/37] Moved git revision LABEL

---
 contexts/server/Dockerfile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/contexts/server/Dockerfile b/contexts/server/Dockerfile
index 51d8d2d..88ef709 100644
--- a/contexts/server/Dockerfile
+++ b/contexts/server/Dockerfile
@@ -18,6 +18,8 @@ RUN \
     mkdir -p /opt/deephaven; \
     tar -xf server-jetty-${DEEPHAVEN_VERSION}.tar -C /opt/deephaven; \
     ln -s /opt/deephaven/server-jetty-${DEEPHAVEN_VERSION} /opt/deephaven/server-jetty
+LABEL \
+    io.deephaven.server.version="${DEEPHAVEN_VERSION}"
 
 # -------------------------------------
 
@@ -29,6 +31,9 @@ RUN \
     mkdir -p /opt/deephaven; \
     tar -xf server-jetty-${DEEPHAVEN_VERSION}.tar -C /opt/deephaven; \
     ln -s /opt/deephaven/server-jetty-${DEEPHAVEN_VERSION} /opt/deephaven/server-jetty
+LABEL \
+    io.deephaven.server.version="${DEEPHAVEN_VERSION}" \
+    org.opencontainers.image.revision="${GIT_REVISION}"
 
 # -------------------------------------
 
@@ -64,7 +69,6 @@ ENV \
     LC_ALL='en_US.UTF-8'
 LABEL \
     io.deephaven.server.ubuntu.version="${UBUNTU_VERSION}" \
-    org.opencontainers.image.revision="${GIT_REVISION}" \
     org.opencontainers.image.vendor="Deephaven Data Labs" \
     org.opencontainers.image.licenses="Deephaven Community License Agreement 1.0" \
     org.opencontainers.image.authors="developers@deephaven.io" \

From 0363a891e75cd49be64e79689e7aa91955d14728 Mon Sep 17 00:00:00 2001
From: Stan Brubaker <120737309+stanbrub@users.noreply.github.com>
Date: Mon, 19 Aug 2024 13:25:50 -0600
Subject: [PATCH 24/37] Update server.hcl

---
 server.hcl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server.hcl b/server.hcl
index 0482119..9af56f0 100644
--- a/server.hcl
+++ b/server.hcl
@@ -173,9 +173,9 @@ target "server-context" {
     context = "contexts/server/"
     args = {
         DEEPHAVEN_VERSION = DEEPHAVEN_VERSION
+        GIT_REVISION = GIT_REVISION
         DEEPHAVEN_CORE_WHEEL = DEEPHAVEN_CORE_WHEEL
         OPENJDK_VERSION = OPENJDK_VERSION
-        GIT_REVISION = GIT_REVISION
         PYTHON_VERSION = PYTHON_VERSION
         UBUNTU_VERSION = UBUNTU_VERSION
         GRPC_HEALTH_PROBE_VERSION = GRPC_HEALTH_PROBE_VERSION

From b00829599a57f580f195ff1a8a4f2c82b77408c4 Mon Sep 17 00:00:00 2001
From: Stan Brubaker <120737309+stanbrub@users.noreply.github.com>
Date: Mon, 19 Aug 2024 13:29:40 -0600
Subject: [PATCH 25/37] Update Dockerfile

---
 contexts/server/Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/contexts/server/Dockerfile b/contexts/server/Dockerfile
index 88ef709..9679376 100644
--- a/contexts/server/Dockerfile
+++ b/contexts/server/Dockerfile
@@ -12,6 +12,7 @@ FROM docker.io/eclipse-temurin:${OPENJDK_VERSION} as openjdk
 
 FROM docker.io/library/busybox as deephaven-released
 ARG DEEPHAVEN_VERSION
+ARG GIT_REVISION
 ADD --link https://github.com/deephaven/deephaven-core/releases/download/v${DEEPHAVEN_VERSION}/server-jetty-${DEEPHAVEN_VERSION}.tar .
 RUN \
     set -eux; \
@@ -25,6 +26,7 @@ LABEL \
 
 FROM docker.io/library/busybox as deephaven-custom
 ARG DEEPHAVEN_VERSION
+ARG GIT_REVISION
 RUN \
     --mount=type=bind,source=server-jetty-${DEEPHAVEN_VERSION}.tar,target=server-jetty-${DEEPHAVEN_VERSION}.tar \
     set -eux; \
@@ -45,7 +47,6 @@ FROM docker.io/ubuntu:${UBUNTU_VERSION} as os-bits
 ARG DEBIAN_FRONTEND="noninteractive"
 ARG TARGETARCH
 ARG UBUNTU_VERSION
-ARG GIT_REVISION
 RUN \
     --mount=type=cache,target=/var/cache/apt,sharing=locked,id=apt-${TARGETARCH}-${UBUNTU_VERSION} \
     --mount=type=cache,target=/var/lib/apt,sharing=locked,id=apt-${TARGETARCH}-${UBUNTU_VERSION} \

From 45b4254b7f8425a7b486b0b2d71d82da18fc64e1 Mon Sep 17 00:00:00 2001
From: Stan Brubaker <120737309+stanbrub@users.noreply.github.com>
Date: Mon, 19 Aug 2024 13:34:29 -0600
Subject: [PATCH 26/37] Update server-slim.hcl

---
 server-slim.hcl | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/server-slim.hcl b/server-slim.hcl
index e8219f6..16db3ff 100644
--- a/server-slim.hcl
+++ b/server-slim.hcl
@@ -28,12 +28,12 @@ variable "DEEPHAVEN_VERSION" {
     default = "0.36.0"
 }
 
-variable "OPENJDK_VERSION" {
-    default = "21"
+variable "GIT_REVISION" {
+    default = ""
 }
 
-variable "GIT_REVISION" {
-    default = "not-set"
+variable "OPENJDK_VERSION" {
+    default = "21"
 }
 
 variable "UBUNTU_VERSION" {
@@ -77,8 +77,8 @@ target "server-slim" {
     ]
     args = {
         DEEPHAVEN_VERSION = DEEPHAVEN_VERSION
-        OPENJDK_VERSION = OPENJDK_VERSION
         GIT_REVISION = GIT_REVISION
+        OPENJDK_VERSION = OPENJDK_VERSION
         UBUNTU_VERSION = UBUNTU_VERSION
         GRPC_HEALTH_PROBE_VERSION = GRPC_HEALTH_PROBE_VERSION
         DEEPHAVEN_SOURCES = DEEPHAVEN_SOURCES

From 62cfb983059a92711b5390b1aa496cbb097564c8 Mon Sep 17 00:00:00 2001
From: Stan Brubaker <120737309+stanbrub@users.noreply.github.com>
Date: Mon, 19 Aug 2024 13:35:33 -0600
Subject: [PATCH 27/37] Update server.hcl

---
 server.hcl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/server.hcl b/server.hcl
index 9af56f0..61a164e 100644
--- a/server.hcl
+++ b/server.hcl
@@ -39,6 +39,10 @@ variable "DEEPHAVEN_VERSION" {
     default = "0.36.0"
 }
 
+variable "GIT_REVISION" {
+    default = ""
+}
+
 variable "DEEPHAVEN_CORE_WHEEL" {
     default = ""
 }
@@ -47,10 +51,6 @@ variable "OPENJDK_VERSION" {
     default = "21"
 }
 
-variable "GIT_REVISION" {
-    default = ""
-}
-
 variable "PYTHON_VERSION" {
     default = "3.10"
 }

From a8d39068910942c04c7957176982e6e770169601 Mon Sep 17 00:00:00 2001
From: Stan Brubaker <120737309+stanbrub@users.noreply.github.com>
Date: Mon, 19 Aug 2024 13:38:13 -0600
Subject: [PATCH 28/37] Update Dockerfile

---
 contexts/server-slim/Dockerfile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/contexts/server-slim/Dockerfile b/contexts/server-slim/Dockerfile
index 63024af..344b520 100644
--- a/contexts/server-slim/Dockerfile
+++ b/contexts/server-slim/Dockerfile
@@ -18,17 +18,23 @@ RUN \
     mkdir -p /opt/deephaven; \
     tar -xf server-jetty-${DEEPHAVEN_VERSION}.tar -C /opt/deephaven; \
     ln -s /opt/deephaven/server-jetty-${DEEPHAVEN_VERSION} /opt/deephaven/server-jetty
+LABEL \
+    io.deephaven.server.version="${DEEPHAVEN_VERSION}"
 
 # -------------------------------------
 
 FROM docker.io/library/busybox as deephaven-custom
 ARG DEEPHAVEN_VERSION
+ARG GIT_REVISION
 RUN \
     --mount=type=bind,source=server-jetty-${DEEPHAVEN_VERSION}.tar,target=server-jetty-${DEEPHAVEN_VERSION}.tar \
     set -eux; \
     mkdir -p /opt/deephaven; \
     tar -xf server-jetty-${DEEPHAVEN_VERSION}.tar -C /opt/deephaven; \
     ln -s /opt/deephaven/server-jetty-${DEEPHAVEN_VERSION} /opt/deephaven/server-jetty
+LABEL \
+    io.deephaven.server.version="${DEEPHAVEN_VERSION}" \
+    org.opencontainers.image.revision="${GIT_REVISION}"
 
 # -------------------------------------
 
@@ -40,7 +46,6 @@ FROM docker.io/ubuntu:${UBUNTU_VERSION} as os-bits
 ARG DEBIAN_FRONTEND="noninteractive"
 ARG TARGETARCH
 ARG UBUNTU_VERSION
-ARG GIT_REVISION
 RUN \
     --mount=type=cache,target=/var/cache/apt,sharing=locked,id=apt-${TARGETARCH}-${UBUNTU_VERSION} \
     --mount=type=cache,target=/var/lib/apt,sharing=locked,id=apt-${TARGETARCH}-${UBUNTU_VERSION} \
@@ -64,7 +69,6 @@ ENV \
     LC_ALL='en_US.UTF-8'
 LABEL \
     io.deephaven.server.ubuntu.version="${UBUNTU_VERSION}" \
-    org.opencontainers.image.revision="${GIT_REVISION}" \
     org.opencontainers.image.vendor="Deephaven Data Labs" \
     org.opencontainers.image.licenses="Deephaven Community License Agreement 1.0" \
     org.opencontainers.image.authors="developers@deephaven.io" \

From 8a660e018b4e6aebc1946ec79f889cc8bd616353 Mon Sep 17 00:00:00 2001
From: Stan Brubaker <120737309+stanbrub@users.noreply.github.com>
Date: Mon, 19 Aug 2024 13:38:32 -0600
Subject: [PATCH 29/37] Update Dockerfile

---
 contexts/server/Dockerfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/contexts/server/Dockerfile b/contexts/server/Dockerfile
index 9679376..8a55bf0 100644
--- a/contexts/server/Dockerfile
+++ b/contexts/server/Dockerfile
@@ -12,7 +12,6 @@ FROM docker.io/eclipse-temurin:${OPENJDK_VERSION} as openjdk
 
 FROM docker.io/library/busybox as deephaven-released
 ARG DEEPHAVEN_VERSION
-ARG GIT_REVISION
 ADD --link https://github.com/deephaven/deephaven-core/releases/download/v${DEEPHAVEN_VERSION}/server-jetty-${DEEPHAVEN_VERSION}.tar .
 RUN \
     set -eux; \

From 4d0f60ca92ac8e7a108c2b79421495e39154f27e Mon Sep 17 00:00:00 2001
From: Stan Brubaker <120737309+stanbrub@users.noreply.github.com>
Date: Mon, 19 Aug 2024 13:51:54 -0600
Subject: [PATCH 30/37] Update branch-ci.yml

---
 .github/workflows/branch-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/branch-ci.yml b/.github/workflows/branch-ci.yml
index 0b5b83c..e70e54b 100644
--- a/.github/workflows/branch-ci.yml
+++ b/.github/workflows/branch-ci.yml
@@ -112,9 +112,9 @@ jobs:
         env:
           DEEPHAVEN_SOURCES: custom
           DEEPHAVEN_VERSION: ${{ steps.artifact_metadata.outputs.deephaven_version }}
+          GIT_REVISION: ${{ needs.assemble-deephaven-core.outputs.git-revision }}
           DEEPHAVEN_CORE_WHEEL: ${{ steps.artifact_metadata.outputs.deephaven_core_wheel }}
           MULTI_ARCH: true
           RELEASE: true
           REPO_PREFIX: ghcr.io/${{ github.repository_owner }}/
-          GIT_REVISION: ${{ needs.assemble-deephaven-core.outputs.git-revision }}
           TAG: ${{ github.event.inputs.image_tag }}

From dfc95013db5cab7d1fee2d7e926361bec0f82bd2 Mon Sep 17 00:00:00 2001
From: Stan Brubaker <120737309+stanbrub@users.noreply.github.com>
Date: Mon, 19 Aug 2024 13:52:38 -0600
Subject: [PATCH 31/37] Update edge-ci.yml

---
 .github/workflows/edge-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/edge-ci.yml b/.github/workflows/edge-ci.yml
index 7b95821..b0392f1 100644
--- a/.github/workflows/edge-ci.yml
+++ b/.github/workflows/edge-ci.yml
@@ -111,9 +111,9 @@ jobs:
         env:
           DEEPHAVEN_SOURCES: custom
           DEEPHAVEN_VERSION: ${{ steps.artifact_metadata.outputs.deephaven_version }}
+          GIT_REVISION: ${{ needs.assemble-deephaven-core.outputs.git-revision }}
           DEEPHAVEN_CORE_WHEEL: ${{ steps.artifact_metadata.outputs.deephaven_core_wheel }}
           MULTI_ARCH: true
           RELEASE: ${{ github.event_name != 'pull_request' }}
           REPO_PREFIX: ghcr.io/${{ github.repository_owner }}/
-          GIT_REVISION: ${{ needs.assemble-deephaven-core.outputs.git-revision }}
           TAG: edge

From 1a653d0728c303db58f9dd5619c76b8fee042efb Mon Sep 17 00:00:00 2001
From: Stan Brubaker <120737309+stanbrub@users.noreply.github.com>
Date: Mon, 19 Aug 2024 15:08:12 -0600
Subject: [PATCH 32/37] Update Dockerfile

---
 contexts/server/Dockerfile | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/contexts/server/Dockerfile b/contexts/server/Dockerfile
index 8a55bf0..e99c787 100644
--- a/contexts/server/Dockerfile
+++ b/contexts/server/Dockerfile
@@ -25,7 +25,6 @@ LABEL \
 
 FROM docker.io/library/busybox as deephaven-custom
 ARG DEEPHAVEN_VERSION
-ARG GIT_REVISION
 RUN \
     --mount=type=bind,source=server-jetty-${DEEPHAVEN_VERSION}.tar,target=server-jetty-${DEEPHAVEN_VERSION}.tar \
     set -eux; \
@@ -33,8 +32,7 @@ RUN \
     tar -xf server-jetty-${DEEPHAVEN_VERSION}.tar -C /opt/deephaven; \
     ln -s /opt/deephaven/server-jetty-${DEEPHAVEN_VERSION} /opt/deephaven/server-jetty
 LABEL \
-    io.deephaven.server.version="${DEEPHAVEN_VERSION}" \
-    org.opencontainers.image.revision="${GIT_REVISION}"
+    io.deephaven.server.version="${DEEPHAVEN_VERSION}"
 
 # -------------------------------------
 
@@ -150,7 +148,7 @@ LABEL \
 
 # -------------------------------------
 
-FROM openjdk-bits as deephaven-bits
+FROM openjdk-bits as deephaven-bits-released
 ARG DEEPHAVEN_VERSION
 COPY --link --from=deephaven /opt/deephaven /opt/deephaven
 LABEL \
@@ -158,6 +156,20 @@ LABEL \
 
 # -------------------------------------
 
+FROM openjdk-bits as deephaven-bits-custom
+ARG DEEPHAVEN_VERSION
+ARG GIT_VERSION
+COPY --link --from=deephaven /opt/deephaven /opt/deephaven
+LABEL \
+    io.deephaven.server.version="${DEEPHAVEN_VERSION}" \
+    org.opencontainers.image.revision="${GIT_REVISION}"
+
+# -------------------------------------
+
+FROM deephaven-bits-${DEEPHAVEN_SOURCES} as deephaven-bits
+
+# -------------------------------------
+
 FROM deephaven-bits as grpc-health-probe-bits
 ARG GRPC_HEALTH_PROBE_VERSION
 ADD --link --chmod=755 \

From cbaec7bc009ce24a3e3e3d4e8769c8ed57cda231 Mon Sep 17 00:00:00 2001
From: Stan Brubaker <120737309+stanbrub@users.noreply.github.com>
Date: Mon, 19 Aug 2024 15:45:43 -0600
Subject: [PATCH 33/37] Update Dockerfile

---
 contexts/server/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contexts/server/Dockerfile b/contexts/server/Dockerfile
index e99c787..5a75491 100644
--- a/contexts/server/Dockerfile
+++ b/contexts/server/Dockerfile
@@ -158,7 +158,7 @@ LABEL \
 
 FROM openjdk-bits as deephaven-bits-custom
 ARG DEEPHAVEN_VERSION
-ARG GIT_VERSION
+ARG GIT_REVISION
 COPY --link --from=deephaven /opt/deephaven /opt/deephaven
 LABEL \
     io.deephaven.server.version="${DEEPHAVEN_VERSION}" \

From ce5b2a35ad4622697c8ac22dbbcab424adf326fa Mon Sep 17 00:00:00 2001
From: Stan Brubaker <120737309+stanbrub@users.noreply.github.com>
Date: Mon, 19 Aug 2024 16:04:59 -0600
Subject: [PATCH 34/37] Update Dockerfile

---
 contexts/server/Dockerfile | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/contexts/server/Dockerfile b/contexts/server/Dockerfile
index 5a75491..d11b4af 100644
--- a/contexts/server/Dockerfile
+++ b/contexts/server/Dockerfile
@@ -18,8 +18,6 @@ RUN \
     mkdir -p /opt/deephaven; \
     tar -xf server-jetty-${DEEPHAVEN_VERSION}.tar -C /opt/deephaven; \
     ln -s /opt/deephaven/server-jetty-${DEEPHAVEN_VERSION} /opt/deephaven/server-jetty
-LABEL \
-    io.deephaven.server.version="${DEEPHAVEN_VERSION}"
 
 # -------------------------------------
 
@@ -31,8 +29,6 @@ RUN \
     mkdir -p /opt/deephaven; \
     tar -xf server-jetty-${DEEPHAVEN_VERSION}.tar -C /opt/deephaven; \
     ln -s /opt/deephaven/server-jetty-${DEEPHAVEN_VERSION} /opt/deephaven/server-jetty
-LABEL \
-    io.deephaven.server.version="${DEEPHAVEN_VERSION}"
 
 # -------------------------------------
 

From d69dc374a3747c73be3d88031a7ceb9e758fb118 Mon Sep 17 00:00:00 2001
From: Stan Brubaker <120737309+stanbrub@users.noreply.github.com>
Date: Mon, 19 Aug 2024 16:09:21 -0600
Subject: [PATCH 35/37] Update Dockerfile

---
 contexts/server-slim/Dockerfile | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/contexts/server-slim/Dockerfile b/contexts/server-slim/Dockerfile
index 344b520..f0e1a4b 100644
--- a/contexts/server-slim/Dockerfile
+++ b/contexts/server-slim/Dockerfile
@@ -18,23 +18,17 @@ RUN \
     mkdir -p /opt/deephaven; \
     tar -xf server-jetty-${DEEPHAVEN_VERSION}.tar -C /opt/deephaven; \
     ln -s /opt/deephaven/server-jetty-${DEEPHAVEN_VERSION} /opt/deephaven/server-jetty
-LABEL \
-    io.deephaven.server.version="${DEEPHAVEN_VERSION}"
 
 # -------------------------------------
 
 FROM docker.io/library/busybox as deephaven-custom
 ARG DEEPHAVEN_VERSION
-ARG GIT_REVISION
 RUN \
     --mount=type=bind,source=server-jetty-${DEEPHAVEN_VERSION}.tar,target=server-jetty-${DEEPHAVEN_VERSION}.tar \
     set -eux; \
     mkdir -p /opt/deephaven; \
     tar -xf server-jetty-${DEEPHAVEN_VERSION}.tar -C /opt/deephaven; \
     ln -s /opt/deephaven/server-jetty-${DEEPHAVEN_VERSION} /opt/deephaven/server-jetty
-LABEL \
-    io.deephaven.server.version="${DEEPHAVEN_VERSION}" \
-    org.opencontainers.image.revision="${GIT_REVISION}"
 
 # -------------------------------------
 
@@ -90,7 +84,7 @@ LABEL \
 
 # -------------------------------------
 
-FROM openjdk-bits as deephaven-bits
+FROM openjdk-bits as deephaven-bits-released
 ARG DEEPHAVEN_VERSION
 COPY --link --from=deephaven /opt/deephaven /opt/deephaven
 LABEL \
@@ -98,6 +92,20 @@ LABEL \
 
 # -------------------------------------
 
+FROM openjdk-bits as deephaven-bits-custom
+ARG DEEPHAVEN_VERSION
+ARG GIT_REVISION
+COPY --link --from=deephaven /opt/deephaven /opt/deephaven
+LABEL \
+    io.deephaven.server.version="${DEEPHAVEN_VERSION}" \
+    org.opencontainers.image.revision="${GIT_REVISION}"
+
+# -------------------------------------
+
+FROM deephaven-bits-${DEEPHAVEN_SOURCES} as deephaven-bits
+
+# -------------------------------------
+
 FROM deephaven-bits as grpc-health-probe-bits
 ARG GRPC_HEALTH_PROBE_VERSION
 ADD --link --chmod=755 \

From 89f3454e03d41270411df71c65e85e9c57a85584 Mon Sep 17 00:00:00 2001
From: Stan Brubaker <120737309+stanbrub@users.noreply.github.com>
Date: Mon, 19 Aug 2024 16:28:52 -0600
Subject: [PATCH 36/37] Test empty git revision

---
 .github/workflows/branch-ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/branch-ci.yml b/.github/workflows/branch-ci.yml
index e70e54b..cd582d9 100644
--- a/.github/workflows/branch-ci.yml
+++ b/.github/workflows/branch-ci.yml
@@ -112,7 +112,6 @@ jobs:
         env:
           DEEPHAVEN_SOURCES: custom
           DEEPHAVEN_VERSION: ${{ steps.artifact_metadata.outputs.deephaven_version }}
-          GIT_REVISION: ${{ needs.assemble-deephaven-core.outputs.git-revision }}
           DEEPHAVEN_CORE_WHEEL: ${{ steps.artifact_metadata.outputs.deephaven_core_wheel }}
           MULTI_ARCH: true
           RELEASE: true

From 31b069fbd22a4eaca9d08f96a762e4df3d718214 Mon Sep 17 00:00:00 2001
From: Stan Brubaker <120737309+stanbrub@users.noreply.github.com>
Date: Mon, 19 Aug 2024 16:42:28 -0600
Subject: [PATCH 37/37] Update branch-ci.yml

---
 .github/workflows/branch-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/branch-ci.yml b/.github/workflows/branch-ci.yml
index cd582d9..e70e54b 100644
--- a/.github/workflows/branch-ci.yml
+++ b/.github/workflows/branch-ci.yml
@@ -112,6 +112,7 @@ jobs:
         env:
           DEEPHAVEN_SOURCES: custom
           DEEPHAVEN_VERSION: ${{ steps.artifact_metadata.outputs.deephaven_version }}
+          GIT_REVISION: ${{ needs.assemble-deephaven-core.outputs.git-revision }}
           DEEPHAVEN_CORE_WHEEL: ${{ steps.artifact_metadata.outputs.deephaven_core_wheel }}
           MULTI_ARCH: true
           RELEASE: true