From 5403088a8cf02b50b603562453f4711b22a375b8 Mon Sep 17 00:00:00 2001 From: WebStreamr <210764791+webstreamr@users.noreply.github.com> Date: Thu, 8 May 2025 21:01:45 +0000 Subject: [PATCH] build(docker): clean-up needed env vars, use sane defaults --- .github/workflows/build.yml | 3 --- Dockerfile | 11 ----------- jest.config.ts | 1 - jest.setup.ts | 2 -- src/addon.test.ts | 5 +++-- src/addon.ts | 4 ++-- 6 files changed, 5 insertions(+), 21 deletions(-) delete mode 100644 jest.setup.ts diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cbbbe6c..d7cab88 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,8 +11,5 @@ jobs: name: Build and push uses: docker/build-push-action@v6 with: - build-args: | - MANIFEST_ID="community.webstreamr" - MANIFEST_NAME="WebStreamr" push: false tags: webstreamr/webstreamr:latest diff --git a/Dockerfile b/Dockerfile index 985c31b..41e3e83 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,17 +16,6 @@ WORKDIR /app COPY --from=builder /app/dist ./dist COPY --from=builder /app/node_modules ./node_modules -ARG PORT - -ARG MANIFEST_ID -RUN test -n "$MANIFEST_ID" || (echo "MANIFEST_ID is not set" && exit 1) - -ARG MANIFEST_NAME -RUN test -n "$MANIFEST_NAME" || (echo "MANIFEST_NAME is not set" && exit 1) - -ENV MANIFEST_ID=$MANIFEST_ID -ENV MANIFEST_NAME=$MANIFEST_NAME ENV NODE_ENV=production -ENV PORT=$PORT CMD ["node", "dist/server.js"] diff --git a/jest.config.ts b/jest.config.ts index 75466ed..a0e6812 100644 --- a/jest.config.ts +++ b/jest.config.ts @@ -20,7 +20,6 @@ const config: Config = { }, }, restoreMocks: true, - setupFilesAfterEnv: ['./jest.setup.ts'], testEnvironment: 'node', transform: { '^.+.tsx?$': ['ts-jest', {}], diff --git a/jest.setup.ts b/jest.setup.ts deleted file mode 100644 index 560880a..0000000 --- a/jest.setup.ts +++ /dev/null @@ -1,2 +0,0 @@ -process.env['MANIFEST_ID'] = 'community.webstreamr'; -process.env['MANIFEST_NAME'] = 'WebStreamr'; diff --git a/src/addon.test.ts b/src/addon.test.ts index 79a3bd2..8efbd37 100644 --- a/src/addon.test.ts +++ b/src/addon.test.ts @@ -1,10 +1,11 @@ import addon from './addon'; describe('addon', () => { - test('manifest can be retrieved', () => { + test('manifest can be retrieved with defaults', () => { expect(addon.manifest).toStrictEqual( expect.objectContaining({ - id: 'community.webstreamr', + id: 'webstreamr', + name: 'WebStreamr', }), ); }); diff --git a/src/addon.ts b/src/addon.ts index 97cea6e..9389696 100644 --- a/src/addon.ts +++ b/src/addon.ts @@ -8,9 +8,9 @@ const handlers: Handler[] = [ ]; const manifest: Manifest = { - id: process.env['MANIFEST_ID'] || '', + id: process.env['MANIFEST_ID'] || 'webstreamr', version: '0.2.0', // x-release-please-version - name: process.env['MANIFEST_NAME'] || '', + name: process.env['MANIFEST_NAME'] || 'WebStreamr', description: `Provides HTTP URLs from streaming websites.`, resources: [ 'stream',