Add working Dockerfile

.dockerignore

@@ -13,3 +13,5 @@ helm-charts
 .editorconfig
 .idea
 coverage*
+uploads
+logs

Dockerfile

@@ -1,8 +1,12 @@
 # use the official Bun image
 # see all versions at https://hub.docker.com/r/oven/bun/tags
-FROM oven/bun:1.0.13-alpine as base
+FROM oven/bun:1.0.14-alpine as base
 WORKDIR /usr/src/app
 
+RUN apk add vips-dev
+# Required for Prisma to work
+COPY --from=node:18-alpine /usr/local/bin/node /usr/local/bin/node
+
 # install dependencies into temp directory
 # this will cache them and speed up future builds
 FROM base AS install
@@ -13,23 +17,28 @@ RUN cd /temp/dev && bun install --frozen-lockfile
 # install with --production (exclude devDependencies)
 RUN mkdir -p /temp/prod
 COPY package.json bun.lockb /temp/prod/
-RUN cd /temp/prod && bun install --frozen-lockfile --production
-
-# copy node_modules from temp directory
-# then copy all (non-ignored) project files into the image
-FROM install AS prerelease
-COPY --from=install /temp/dev/node_modules node_modules
-COPY . .
+RUN cd /temp/prod && bun install --frozen-lockfile --production.
 
 # copy production dependencies and source code into final image
 FROM base AS release
 
 # Create app directory
 RUN mkdir -p /app
 COPY --from=install /temp/prod/node_modules /app/node_modules
-COPY --from=prerelease /usr/src/app /app
+COPY . /app
 
+LABEL org.opencontainers.image.authors "Gaspard Wierzbinski (https://cpluspatch.dev)"
+LABEL org.opencontainers.image.source "https://github.com/lysand-org/lysand"
+LABEL org.opencontainers.image.vendor "Lysand Org"
+LABEL org.opencontainers.image.licenses "AGPL-3.0"
+LABEL org.opencontainers.image.title "Lysand Server"
+LABEL org.opencontainers.image.description "Lysand Server docker image"
 
 # run the app
 USER bun
+RUN bunx prisma generate
+# Remove Node
+USER root
+RUN rm /usr/local/bin/node
+USER bun
 ENTRYPOINT [ "bun", "run", "index.ts" ]

config/config.example.toml

@@ -9,7 +9,7 @@ database = "lysand"
 host = "localhost"
 post = 6379
 password = ""
-database = 0
+# database = 0
 
 [http]
 base_url = "https://lysand.social"

database/datasource.ts

@@ -13,7 +13,7 @@ const federationQueue = new Queue("federation", {
 		host: config.redis.queue.host,
 		port: config.redis.queue.port,
 		password: config.redis.queue.password,
-		db: config.redis.queue.database,
+		db: config.redis.queue.database || undefined,
 	},
 });
 

database/entities/Queue.ts

@@ -114,7 +114,7 @@ export const federationWorker = new Worker(
 			host: config.redis.queue.host,
 			port: config.redis.queue.port,
 			password: config.redis.queue.password,
-			db: config.redis.queue.database,
+			db: config.redis.queue.database || undefined,
 		},
 		removeOnComplete: {
 			count: 400,

package.json

@@ -80,6 +80,7 @@
     "jsonld": "^8.3.1",
     "marked": "^9.1.2",
     "prisma": "latest",
-    "sharp": "^0.32.6"
+    "semver": "^7.5.4",
+    "sharp": "^0.33.0-rc.2"
   }
 }

utils/config.ts

@@ -14,7 +14,7 @@ export interface ConfigType {
 			host: string;
 			port: number;
 			password: string;
-			database: number;
+			database: number | null;
 		};
 	};
 
@@ -159,7 +159,7 @@ export const configDefaults: ConfigType = {
 			host: "localhost",
 			port: 6379,
 			password: "",
-			database: 0,
+			database: null,
 		},
 	},
 	instance: {