From 0730c265b263a17cd246485f621ed96784fb1e15 Mon Sep 17 00:00:00 2001
From: jleaniz <leaniz@google.com>
Date: Wed, 27 Sep 2023 15:40:02 +0000
Subject: [PATCH] Testing release tag builid

---
 docker/api_server/Dockerfile      | 21 +++------------------
 docker/api_server/cloudbuild.yaml |  2 ++
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/docker/api_server/Dockerfile b/docker/api_server/Dockerfile
index 6bbf18284..2e0a83fb3 100644
--- a/docker/api_server/Dockerfile
+++ b/docker/api_server/Dockerfile
@@ -12,25 +12,10 @@ FROM ubuntu:22.04 as build-stage2
 ENV DEBIAN_FRONTEND=noninteractive 
 COPY --from=build-stage /tmp/web/dist /web/dist
 RUN apt-get update && apt-get -y upgrade
-RUN apt-get -y install git python3-pip python3.10-venv
+RUN apt-get -y install git python3-pip
 RUN pip3 install pip --upgrade
-RUN python3 -m venv /venv
-
-COPY . /tmp/
-
-# unshallow and fetch all tags so our build systems pickup the correct git tag if it's a shallow clone
-RUN if $(cd /tmp/ && git rev-parse --is-shallow-repository); then cd /tmp/ && git fetch --prune --unshallow && git fetch --depth=1 origin +refs/tags/*:refs/tags/*; fi
-
-# Build and install the package wheel using pip (will pull dependencies from pyproject.toml)
-ENV PATH="/venv/bin:$PATH" VIRTUAL_ENV=/venv
-RUN cd /tmp/ && pip3 install wheel && pip3 install .
-
-# Final stage contains python and the virtualenv built in stage2
-FROM ubuntu:22.04 as build-final
-
-COPY --from=build-stage2 /venv /venv
-RUN apt-get update && apt-get -y upgrade
-RUN apt-get -y install python3-pip
+ARG RELEASE_TAG
+RUN pip3 install turbinia==$RELEASE_TAG
 RUN useradd -r -s /bin/nologinpoet -u 999 turbinia
 RUN mkdir /etc/turbinia && mkdir -p /mnt/turbinia/ && mkdir -p /var/lib/turbinia/ \
     && mkdir -p /var/log/turbinia/ && chown -R turbinia:turbinia /mnt/turbinia/ \
diff --git a/docker/api_server/cloudbuild.yaml b/docker/api_server/cloudbuild.yaml
index 1c2f90e19..81b2a6356 100644
--- a/docker/api_server/cloudbuild.yaml
+++ b/docker/api_server/cloudbuild.yaml
@@ -4,6 +4,8 @@ steps:
     args:
       [
         "build",
+        '--build-arg',
+        'RELEASE_TAG=$TAG_NAME',
         "-t",
         "us-docker.pkg.dev/osdfir-registry/turbinia/release/turbinia-api-server:$TAG_NAME",
         "-t",