Skip to content

Commit 6cdcba8

Browse files
authored
Merge pull request #70 from fredrikj31/fix-docker-file-build
fix docker file build
2 parents 1d91365 + 976b327 commit 6cdcba8

File tree

10 files changed

+396
-339
lines changed

10 files changed

+396
-339
lines changed

api/.eslintignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.turbo
2+
node_modules
3+
build

api/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
"typescript": "^5.5.4"
1818
},
1919
"dependencies": {
20-
"@fastify/cookie": "^9.4.0",
21-
"@fastify/cors": "^9.0.1",
22-
"@fastify/swagger": "^8.15.0",
23-
"@fastify/swagger-ui": "^4.1.0",
20+
"@fastify/cookie": "^11.0.1",
21+
"@fastify/cors": "^10.0.1",
22+
"@fastify/swagger": "^9.2.0",
23+
"@fastify/swagger-ui": "^5.1.0",
2424
"dotenv": "^16.4.5",
25-
"fastify": "^4.28.1",
26-
"fastify-plugin": "^4.5.1",
27-
"fastify-type-provider-zod": "^2.0.0",
25+
"fastify": "^5.0.0",
26+
"fastify-plugin": "^5.0.1",
27+
"fastify-type-provider-zod": "^4.0.2",
2828
"jsonwebtoken": "^9.0.2",
2929
"pino": "^9.3.2",
3030
"slonik": "^46.1.0",

api/src/app.ts

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,12 @@ app.setErrorHandler((error, _, res) => {
6464
});
6565
});
6666

67-
app.listen(
68-
{ port: config.api.port, host: config.api.host },
69-
(err: Error | null) => {
70-
if (err) {
71-
app.log.error(err);
72-
process.exit(1);
73-
}
74-
},
75-
);
67+
app.listen({ host: "0.0.0.0", port: config.api.port }, (err: Error | null) => {
68+
if (err) {
69+
app.log.error(err);
70+
process.exit(1);
71+
}
72+
});
7673

7774
process.on("SIGINT", () => {
7875
app.log.warn(`SIGINT signal detected, terminating service`);

api/src/routes/friends/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { createFriendRequestHandler } from "./handlers/createFriendRequest";
1616
import { deleteFriendRequestHandler } from "./handlers/deleteFriendRequest";
1717
import { acceptFriendRequestHandler } from "./handlers/acceptFriendRequest";
1818
import { declineFriendRequestHandler } from "./handlers/declineFriendRequest";
19-
import { listSentFriendRequestsHandler } from "./handlers/listSenTFriendRequests";
19+
import { listSentFriendRequestsHandler } from "./handlers/listSentFriendRequests";
2020

2121
export const friendsRoutes: FastifyPluginAsync = async (instance) => {
2222
const app = instance.withTypeProvider<ZodTypeProvider>();

app/.eslintignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.turbo
2+
node_modules
3+
dist

app/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
"axios": "^1.7.5",
2222
"class-variance-authority": "^0.7.0",
2323
"clsx": "^2.1.1",
24-
"date-fns": "^3.6.0",
24+
"date-fns": "^4.1.0",
2525
"js-cookie": "^3.0.5",
26-
"lucide-react": "^0.436.0",
26+
"lucide-react": "^0.453.0",
2727
"luxon": "^3.5.0",
2828
"react": "^18.3.1",
29-
"react-day-picker": "^9.0.8",
29+
"react-day-picker": "^8.10.1",
3030
"react-dom": "^18.3.1",
3131
"react-router-dom": "^6.26.1",
3232
"tailwind-merge": "^2.5.2",
@@ -44,7 +44,7 @@
4444
"@vitejs/plugin-react": "^4.3.1",
4545
"autoprefixer": "^10.4.20",
4646
"eslint": "^8.57.0",
47-
"eslint-plugin-react-hooks": "^4.6.2",
47+
"eslint-plugin-react-hooks": "^5.0.0",
4848
"postcss": "^8.4.41",
4949
"tailwindcss": "^3.4.10",
5050
"typescript": "^5.5.4",

app/src/shadcn-ui/components/ui/button.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { cva, type VariantProps } from "class-variance-authority";
55
import { cn } from "@shadcn-ui/lib/utils";
66

77
const buttonVariants = cva(
8-
"inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50",
8+
"inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0",
99
{
1010
variants: {
1111
variant: {

docker-compose.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ services:
1010
POSTGRES_USER: ${DB_USER}
1111
POSTGRES_PASSWORD: ${DB_PASSWORD}
1212
POSTGRES_DB: thoughts
13+
ports:
14+
- 5432:5432
1315
networks:
1416
- thoughts-network
1517
volumes:
@@ -29,7 +31,7 @@ services:
2931
DB_HOST: ${DB_HOST}
3032
DB_PORT: ${DB_PORT}
3133
DB_NAME: ${DB_NAME}
32-
DB_USERNAME: ${DB_USERNAME}
34+
DB_USER: ${DB_USER}
3335
DB_PASSWORD: ${DB_PASSWORD}
3436
networks:
3537
- thoughts-network

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"prettier": "^3.3.3",
1616
"turbo": "^2.1.0"
1717
},
18-
"packageManager": "pnpm@8.15.0",
18+
"packageManager": "pnpm@9.1.4",
1919
"engines": {
2020
"node": ">=20"
2121
}

0 commit comments

Comments
 (0)