Clean up type errors and get docker build into better state

This commit is contained in:
Mike Conrad
2025-05-19 13:48:47 -04:00
parent 7fa503897c
commit 7ffe4d2825
6 changed files with 14 additions and 9 deletions

View File

@ -5,10 +5,11 @@ LOG_LEVEL=info
APP_KEY=
NODE_ENV=development
SESSION_DRIVER=cookie
PG_PORT=5432
PG_HOST=localhost
PG_PASSWORD=password
SENTRY_TOKEN=
SENTRY_ORG=
REDIS_HOST=sentry-redis-1
REDIS_PORT=6379
REDIS_PASSWORD=
REDIS_PASSWORD=

4
.gitignore vendored
View File

@ -6,8 +6,8 @@ tmp
# Secrets
.env
.env.local
.env.production.local
.env.development.local
.env.production
.env.develop
# Frontend assets compiled code
public/assets

View File

@ -1,10 +1,10 @@
FROM node:20.12.2-alpine3.18 AS base
# All deps stage
FROM base AS deps
WORKDIR /app
ADD package.json package-lock.json ./
RUN npm ci
FROM node:22 AS dev-deps
WORKDIR /app
@ -24,7 +24,7 @@ FROM base AS build
WORKDIR /app
COPY --from=deps /app/node_modules /app/node_modules
ADD . .
RUN node ace build --ignore-ts-errors
RUN node ace build
# Production stage
FROM base
@ -33,4 +33,4 @@ WORKDIR /app
COPY --from=production-deps /app/node_modules /app/node_modules
COPY --from=build /app/build /app
EXPOSE 8080
CMD ["node", "./bin/server.js"]
CMD ["node", "./bin/server.js"]

View File

@ -135,7 +135,7 @@ function parseSentryLinkHeader(header:string): SentryPagination {
}, {} as Record<string, any>)
}
function buildPaginationLinks(meta) {
function buildPaginationLinks(meta: { previousPageUrl: string, lastPage: number; currentPage: number; nextPageUrl: string}) {
const links = []
// Previous

View File

@ -1,4 +1,3 @@
import app from '@adonisjs/core/services/app'
import { defineConfig } from '@adonisjs/lucid'
import env from '#start/env'

View File

@ -27,5 +27,10 @@ export default await Env.create(new URL('../', import.meta.url), {
REDIS_HOST: Env.schema.string({ format: 'host' }),
REDIS_PORT: Env.schema.number(),
REDIS_PASSWORD: Env.schema.string.optional()
REDIS_PASSWORD: Env.schema.string.optional(),
PG_PORT: Env.schema.number(),
PG_HOST: Env.schema.string(),
PG_USER: Env.schema.string(),
PG_PASSWORD: Env.schema.string(),
})