From b05dcf673d03e3e2292a3f087efc2941d108fac5 Mon Sep 17 00:00:00 2001 From: Logan Date: Fri, 3 Apr 2026 12:48:18 -0500 Subject: [PATCH] Fix frontend build fail in pipeline --- app/client/Dockerfile | 3 +-- app/client/Dockerfile.test | 2 +- app/client/docker-compose.test.yml | 2 +- app/client/docker-compose.yml | 7 ------- app/client/src/components/TransactionTable.tsx | 1 + app/client/src/pages/LoginPage.tsx | 2 +- 6 files changed, 5 insertions(+), 12 deletions(-) diff --git a/app/client/Dockerfile b/app/client/Dockerfile index 8f0fe98..42e73fa 100644 --- a/app/client/Dockerfile +++ b/app/client/Dockerfile @@ -12,9 +12,8 @@ COPY index.* . COPY public ./public COPY src ./src -FROM finus-webserver-base:local as base RUN bun run build FROM nginx:1.29.5-alpine3.23-perl -COPY --from=base /app/dist /data/www +COPY --from=builder /app/dist /data/www COPY nginx.conf /etc/nginx/nginx.conf diff --git a/app/client/Dockerfile.test b/app/client/Dockerfile.test index 2eb18e8..e7d096f 100644 --- a/app/client/Dockerfile.test +++ b/app/client/Dockerfile.test @@ -1,4 +1,4 @@ -FROM finus-webserver-base:local +FROM local/finus-webserver-base:latest COPY test ./test COPY vitest.config.ts . diff --git a/app/client/docker-compose.test.yml b/app/client/docker-compose.test.yml index 566bead..e54856d 100644 --- a/app/client/docker-compose.test.yml +++ b/app/client/docker-compose.test.yml @@ -1,6 +1,6 @@ services: webserver-base: - image: finus-webserver-base:local + image: local/finus-webserver-base:latest build: dockerfile: Dockerfile.base diff --git a/app/client/docker-compose.yml b/app/client/docker-compose.yml index d1b59e3..9dcbd8b 100644 --- a/app/client/docker-compose.yml +++ b/app/client/docker-compose.yml @@ -1,14 +1,7 @@ services: - webserver-base: - image: $DOCKER_HUB_USERNAME/finus-webserver-base:$RELEASE_VERSION - build: - dockerfile: Dockerfile.base - webserver: image: $DOCKER_HUB_USERNAME/finus-webserver:$RELEASE_VERSION build: dockerfile: Dockerfile ports: - "80:80" - depends_on: - - webserver-base diff --git a/app/client/src/components/TransactionTable.tsx b/app/client/src/components/TransactionTable.tsx index c68c1b4..c631f80 100644 --- a/app/client/src/components/TransactionTable.tsx +++ b/app/client/src/components/TransactionTable.tsx @@ -11,6 +11,7 @@ import { AiOutlinePlus, AiOutlineClose, AiOutlineUpload, + AiOutlineTransaction, } from "react-icons/ai"; import NoItemState from "./NoItemState.tsx"; import { FiEdit2 } from "react-icons/fi"; diff --git a/app/client/src/pages/LoginPage.tsx b/app/client/src/pages/LoginPage.tsx index ec8d618..92a77b1 100644 --- a/app/client/src/pages/LoginPage.tsx +++ b/app/client/src/pages/LoginPage.tsx @@ -52,7 +52,7 @@ function LoginPage({ onLogin, requestAuth }: LoginPageProps) { Finus - Welcome back + Bye bye Log in to continue managing your finances.