versia-pub/server
2
0
Fork 0
mirror of https://github.com/versia-pub/server.git synced 2025-12-06 08:28:19 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: 🐛 Properly install and import the S3 client

Browse source
This commit is contained in:
Jesse Wierzbinski 2024-06-28 20:49:17 -10:00
parent 106e34848a
commit e95cabb304
No known key found for this signature in database
6 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Dockerfile
View file

@ -1,6 +1,6 @@
# Use 1.1.4 for building to prevent a Unicode bug with 1.1.5+ # Use 1.1.4 for building to prevent a Unicode bug with 1.1.5+
# Temporary until they fix it # 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++ RUN apk add --no-cache libstdc++
@ -13,7 +13,7 @@ COPY . /temp
WORKDIR /temp WORKDIR /temp
RUN bun install --production RUN bun install --production
FROM base as build FROM base AS build
# Copy the project # Copy the project
RUN mkdir -p /temp RUN mkdir -p /temp
@ -35,12 +35,12 @@ RUN mkdir -p /app
COPY --from=build /temp/dist /app/dist COPY --from=build /temp/dist /app/dist
COPY entrypoint.sh /app COPY entrypoint.sh /app
LABEL org.opencontainers.image.authors "Gaspard Wierzbinski (https://cpluspatch.dev)" 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.source="https://github.com/lysand-org/lysand"
LABEL org.opencontainers.image.vendor "Lysand Org" LABEL org.opencontainers.image.vendor="Lysand Org"
LABEL org.opencontainers.image.licenses "AGPL-3.0-or-later" LABEL org.opencontainers.image.licenses="AGPL-3.0-or-later"
LABEL org.opencontainers.image.title "Lysand Server" LABEL org.opencontainers.image.title="Lysand Server"
LABEL org.opencontainers.image.description "Lysand Server docker image" LABEL org.opencontainers.image.description="Lysand Server docker image"
# CD to app # CD to app
WORKDIR /app WORKDIR /app

1
build.ts
View file

@ -20,6 +20,7 @@ await Bun.build({
external: ["unzipit"], external: ["unzipit"],
}).then((output) => { }).then((output) => {
if (!output.success) { if (!output.success) {
console.error(output.logs);
process.exit(1); process.exit(1);
} }
}); });

BIN
bun.lockb
View file

Binary file not shown.

2
classes/media/drivers/s3.test.ts
View file

@ -4,7 +4,7 @@
*/ */
import { beforeEach, describe, expect, it, mock } from "bun:test"; 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 { Config } from "config-manager";
import type { MediaHasher } from "../media-hasher"; import type { MediaHasher } from "../media-hasher";
import { S3MediaDriver } from "./s3"; import { S3MediaDriver } from "./s3";

2
classes/media/drivers/s3.ts
View file

@ -3,7 +3,7 @@
* @module MediaManager/Drivers * @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 type { Config } from "config-manager";
import { MediaHasher } from "../media-hasher"; import { MediaHasher } from "../media-hasher";
import type { UploadedFileMetadata } from "../media-manager"; import type { UploadedFileMetadata } from "../media-manager";

1
package.json
View file

@ -96,6 +96,7 @@
"typescript": "^5.3.2" "typescript": "^5.3.2"
}, },
"dependencies": { "dependencies": {
"@bradenmacdonald/s3-lite-client": "npm:@jsr/bradenmacdonald__s3-lite-client",
"@hackmd/markdown-it-task-lists": "^2.1.4", "@hackmd/markdown-it-task-lists": "^2.1.4",
"@hono/zod-validator": "^0.2.2", "@hono/zod-validator": "^0.2.2",
"@inquirer/confirm": "^3.1.11", "@inquirer/confirm": "^3.1.11",