Skip to content

Commit 61a00c4

Browse files
docker runns on linux now
1 parent c874daf commit 61a00c4

File tree

7 files changed

+63
-4
lines changed

7 files changed

+63
-4
lines changed

.Dockerfile.swo

Whitespace-only changes.

.Dockerfile.swp

Whitespace-only changes.

Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,5 @@ COPY --from=deps /app/node_modules /app/node_modules
1717

1818
EXPOSE 3000
1919

20-
RUN pnpm add -g @openapitools/openapi-generator-cli
21-
RUN openapi-generator-cli generate -i http://localhost:8000/openapi.json -o src/api/openapi -g typescript-fetch
22-
2320
CMD ["pnpm", "run", "dev"]
21+

Dockerfile_backup

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
FROM node:23-slim AS base
2+
ENV PNPM_HOME="/pnpm"
3+
ENV PATH="$PNPM_HOME:$PATH"
4+
RUN corepack enable
5+
COPY . /app
6+
WORKDIR /app
7+
8+
RUN apt-get update && \
9+
apt-get install -y openjdk-17-jdk && \
10+
rm -rf /var/lib/apt/lists/*
11+
12+
FROM base AS deps
13+
RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install
14+
15+
FROM base
16+
COPY --from=deps /app/node_modules /app/node_modules
17+
18+
EXPOSE 3000
19+
20+
RUN pnpm add -g @openapitools/openapi-generator-cli
21+
RUN openapi-generator-cli generate -i http://localhost:8000/openapi.json -o src/api/openapi -g typescript-fetch
22+
23+
CMD ["pnpm", "run", "dev"]

docker-compose.yml

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,27 @@ services:
55
build: .
66
ports:
77
- "3000:3000"
8-
command: ["pnpm", "run", "dev"]
8+
depends_on:
9+
- app
10+
entrypoint: >
11+
sh -c "
12+
apt-get update &&
13+
apt-get install -y curl &&
14+
while ! curl -s http://app:8000/openapi.json; do
15+
echo 'Waiting for app to be available...';
16+
sleep 2;
17+
done &&
18+
pnpm add -g @openapitools/openapi-generator-cli &&
19+
openapi-generator-cli generate -i http://app:8000/openapi.json -o src/api/openapi -g typescript-fetch &&
20+
pnpm run dev
21+
"
22+
23+
app:
24+
build:
25+
context: ../fake-backend
26+
dockerfile: Dockerfile
27+
ports:
28+
- "8000:8000"
29+
volumes:
30+
- ../fake-backend:/app
31+

docker-compose.yml_backup

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
version: '3.8'
2+
3+
services:
4+
frontend-service:
5+
build: .
6+
ports:
7+
- "3000:3000"
8+
command: ["pnpm", "run", "dev"]

openapitools.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"$schema": "./node_modules/@openapitools/openapi-generator-cli/config.schema.json",
3+
"spaces": 2,
4+
"generator-cli": {
5+
"version": "7.10.0"
6+
}
7+
}

0 commit comments

Comments
 (0)