Skip to content

Commit 4da8c7c

Browse files
authored
Merge pull request #1114 from AmyrAhmady/master
Move our frontend stack to docusaurus
2 parents 526f873 + e2af193 commit 4da8c7c

File tree

9,345 files changed

+318338
-348737
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

9,345 files changed

+318338
-348737
lines changed

.github/workflows/deploy-web.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ jobs:
2020
access_token: ${{ github.token }}
2121
- uses: actions/checkout@v3
2222
- uses: superfly/flyctl-actions/setup-flyctl@master
23-
- run: flyctl deploy --remote-only --depot=false --config frontend.fly.toml
23+
- run: flyctl deploy --remote-only --config frontend.fly.toml

Dockerfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ ADD . .
2929
# Install prisma client code generation tool and generate prisma bindings
3030
RUN task generate
3131

32-
# Build the docs search index
33-
RUN task docsindex
34-
3532
# Build the server binary
3633
RUN task build
3734

Dockerfile.frontend

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
1-
FROM node:16-alpine AS deps
1+
FROM node:20-alpine AS deps
22
RUN apk add --no-cache libc6-compat git
33
WORKDIR /app
44
COPY frontend/package.json frontend/yarn.lock ./frontend/
55
RUN cd frontend && yarn install --frozen-lockfile
66

7-
FROM node:16-alpine AS builder
7+
FROM node:20-alpine AS builder
88
RUN apk add --no-cache git
99
WORKDIR /app
1010
# Copy everything
1111
COPY . .
1212
COPY --from=deps /app/frontend/node_modules ./frontend/node_modules
1313
RUN cd frontend && yarn build && yarn install --production --ignore-scripts --prefer-offline
1414

15-
# Production image, copy all the files and run next
16-
FROM node:16-alpine AS runner
15+
# Production image, copy all the files and run docusaurus
16+
FROM node:20-alpine AS runner
1717
WORKDIR /app
1818

1919
ENV NODE_ENV production
2020

2121
RUN addgroup -g 1001 -S nodejs
22-
RUN adduser -S nextjs -u 1001
22+
RUN adduser -S ompweb -u 1001
2323

24-
COPY --from=builder --chown=nextjs:nodejs /app/ .
24+
COPY --from=builder --chown=ompweb:nodejs /app/ .
2525
WORKDIR /app/frontend
2626

27-
USER nextjs
27+
USER ompweb
2828

2929
EXPOSE 3000
3030

31-
CMD ["yarn", "start"]
31+
CMD ["yarn", "serve"]

Taskfile.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@ tasks:
3939
# Also generate TypeScript type declarations from some backend structs.
4040
- go run types.go
4141

42-
docsindex:
43-
cmds:
44-
- go run ./cmd/indexbuilder/main.go
45-
4642
migrate:
4743
cmds:
4844
- npx prisma migrate dev

app/services/docsindex/docsindex.go

Lines changed: 0 additions & 307 deletions
This file was deleted.

0 commit comments

Comments
 (0)