diff --git a/Dockerfile b/Dockerfile index c37fb107..37417c1f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # Use 1.1.4 for building to prevent a Unicode bug with 1.1.5+ # Temporary until they fix it -FROM oven/bun:1.1.4-alpine as base +FROM oven/bun:1.1.4-alpine AS base RUN apk add --no-cache libstdc++ @@ -13,7 +13,7 @@ COPY . /temp WORKDIR /temp RUN bun install --production -FROM base as build +FROM base AS build # Copy the project RUN mkdir -p /temp @@ -35,12 +35,12 @@ RUN mkdir -p /app COPY --from=build /temp/dist /app/dist COPY entrypoint.sh /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-or-later" -LABEL org.opencontainers.image.title "Lysand Server" -LABEL org.opencontainers.image.description "Lysand Server docker image" +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-or-later" +LABEL org.opencontainers.image.title="Lysand Server" +LABEL org.opencontainers.image.description="Lysand Server docker image" # CD to app WORKDIR /app diff --git a/build.ts b/build.ts index 468f91ca..7dc49a3e 100644 --- a/build.ts +++ b/build.ts @@ -20,6 +20,7 @@ await Bun.build({ external: ["unzipit"], }).then((output) => { if (!output.success) { + console.error(output.logs); process.exit(1); } }); diff --git a/bun.lockb b/bun.lockb index 0959b753..31acd855 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/classes/media/drivers/s3.test.ts b/classes/media/drivers/s3.test.ts index a28bbb4f..562a590c 100644 --- a/classes/media/drivers/s3.test.ts +++ b/classes/media/drivers/s3.test.ts @@ -4,7 +4,7 @@ */ import { beforeEach, describe, expect, it, mock } from "bun:test"; -import type { S3Client } from "@jsr/bradenmacdonald__s3-lite-client"; +import type { S3Client } from "@bradenmacdonald/s3-lite-client"; import type { Config } from "config-manager"; import type { MediaHasher } from "../media-hasher"; import { S3MediaDriver } from "./s3"; diff --git a/classes/media/drivers/s3.ts b/classes/media/drivers/s3.ts index f4081306..d1e1e2d2 100644 --- a/classes/media/drivers/s3.ts +++ b/classes/media/drivers/s3.ts @@ -3,7 +3,7 @@ * @module MediaManager/Drivers */ -import { S3Client } from "@jsr/bradenmacdonald__s3-lite-client"; +import { S3Client } from "@bradenmacdonald/s3-lite-client"; import type { Config } from "config-manager"; import { MediaHasher } from "../media-hasher"; import type { UploadedFileMetadata } from "../media-manager"; diff --git a/package.json b/package.json index 1562e372..b461201b 100644 --- a/package.json +++ b/package.json @@ -96,6 +96,7 @@ "typescript": "^5.3.2" }, "dependencies": { + "@bradenmacdonald/s3-lite-client": "npm:@jsr/bradenmacdonald__s3-lite-client", "@hackmd/markdown-it-task-lists": "^2.1.4", "@hono/zod-validator": "^0.2.2", "@inquirer/confirm": "^3.1.11",