From 726f38c15f25b8c993bab487a8005ba4c8a0aba4 Mon Sep 17 00:00:00 2001 From: Joel Biddle Date: Wed, 4 Oct 2023 04:50:16 +0000 Subject: [PATCH] Resolve review comments --- .github/workflows/build-docker-image-to-prod.yml | 14 +++----------- frontend/src/layouts/AppLayout/AppLayout.tsx | 11 +++++++---- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build-docker-image-to-prod.yml b/.github/workflows/build-docker-image-to-prod.yml index 3d3994e29..c6b87345c 100644 --- a/.github/workflows/build-docker-image-to-prod.yml +++ b/.github/workflows/build-docker-image-to-prod.yml @@ -40,9 +40,7 @@ jobs: load: true context: backend tags: | - infisical/backend:${{ steps.extract_version.outputs.version }} - labels: | - version=${{ steps.extract_version.outputs.version }} + infisical/backend:test - name: ⏻ Spawn backend container and dependencies run: | docker compose -f .github/resources/docker-compose.be-test.yml up --wait --quiet-pull @@ -63,8 +61,6 @@ jobs: infisical/backend:${{ steps.commit.outputs.short }} infisical/backend:${{ steps.extract_version.outputs.version }} platforms: linux/amd64,linux/arm64 - labels: | - version=${{ steps.extract_version.outputs.version }} frontend-image: name: Build frontend image @@ -95,12 +91,10 @@ jobs: project: 64mmf0n610 context: frontend tags: | - infisical/frontend:${{ steps.extract_version.outputs.version }} + infisical/frontend:test build-args: | POSTHOG_API_KEY=${{ secrets.PUBLIC_POSTHOG_API_KEY }} NEXT_INFISICAL_PLATFORM_VERSION=${{ steps.extract_version.outputs.version }} - labels: | - version=${{ steps.extract_version.outputs.version }} - name: ⏻ Spawn frontend container run: | docker run -d --rm --name infisical-frontend-test infisical/frontend:test @@ -123,6 +117,4 @@ jobs: platforms: linux/amd64,linux/arm64 build-args: | POSTHOG_API_KEY=${{ secrets.PUBLIC_POSTHOG_API_KEY }} - NEXT_INFISICAL_PLATFORM_VERSION=${{ steps.extract_version.outputs.version }} - labels: | - version=${{ steps.extract_version.outputs.version }} \ No newline at end of file + NEXT_INFISICAL_PLATFORM_VERSION=${{ steps.extract_version.outputs.version }} \ No newline at end of file diff --git a/frontend/src/layouts/AppLayout/AppLayout.tsx b/frontend/src/layouts/AppLayout/AppLayout.tsx index 04b80664a..4445ea7ff 100644 --- a/frontend/src/layouts/AppLayout/AppLayout.tsx +++ b/frontend/src/layouts/AppLayout/AppLayout.tsx @@ -123,6 +123,7 @@ export const AppLayout = ({ children }: LayoutProps) => { const createWs = useCreateWorkspace(); const uploadWsKey = useUploadWsKey(); const addWsUser = useAddUserToWs(); + const infisicalPlatformVersion = process.env.NEXT_PUBLIC_INFISICAL_PLATFORM_VERSION; const { popUp, handlePopUpOpen, handlePopUpClose, handlePopUpToggle } = usePopUp([ "addNewWs", @@ -697,10 +698,12 @@ export const AppLayout = ({ children }: LayoutProps) => { )} -
- - Platform Version: {process.env.NEXT_PUBLIC_INFISICAL_PLATFORM_VERSION || "N/A"} -
+ {infisicalPlatformVersion && ( +
+ + Platform Version: {infisicalPlatformVersion} +
+ )}