Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions app/client/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion app/client/Dockerfile.test
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM finus-webserver-base:local
FROM local/finus-webserver-base:latest

Check warning on line 1 in app/client/Dockerfile.test

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Use a specific version tag for the image.

See more on https://sonarcloud.io/project/issues?id=MeasureOneCodeTwice_Finus&issues=AZ1UodBvojYqUzZi4p5C&open=AZ1UodBvojYqUzZi4p5C&pullRequest=111

COPY test ./test
COPY vitest.config.ts .
Expand Down
2 changes: 1 addition & 1 deletion app/client/docker-compose.test.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
webserver-base:
image: finus-webserver-base:local
image: local/finus-webserver-base:latest
build:
dockerfile: Dockerfile.base

Expand Down
7 changes: 0 additions & 7 deletions app/client/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions app/client/src/components/TransactionTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
AiOutlinePlus,
AiOutlineClose,
AiOutlineUpload,
AiOutlineTransaction,
} from "react-icons/ai";
import NoItemState from "./NoItemState.tsx";
import { FiEdit2 } from "react-icons/fi";
Expand Down
2 changes: 1 addition & 1 deletion app/client/src/pages/LoginPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ function LoginPage({ onLogin, requestAuth }: LoginPageProps) {
<Badge variant="outline" className="auth-tag">
Finus
</Badge>
<CardTitle className="auth-title">Welcome back</CardTitle>
<CardTitle className="auth-title">Bye bye</CardTitle>
<CardDescription className="auth-copy text-base">
Log in to continue managing your finances.
</CardDescription>
Expand Down