Skip to content

Commit f4890d7

Browse files
committed
Revert "Merge branch 'jonas/pjs-2065-support-multiple-docker-image-architectures' into rc"
This reverts commit fd16d4c, reversing changes made to 9457cc2.
1 parent 3b07ba7 commit f4890d7

File tree

9 files changed

+14251
-10379
lines changed

9 files changed

+14251
-10379
lines changed

.github/workflows/node.js.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414

1515
strategy:
1616
matrix:
17-
node-version: [18.x, 20.x, 22.x]
17+
node-version: [16.x, 18.x, 20.x]
1818
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
1919

2020
steps:
@@ -23,11 +23,11 @@ jobs:
2323
uses: actions/setup-node@v4
2424
with:
2525
node-version: ${{ matrix.node-version }}
26-
- run: corepack enable
27-
- run: yarn install --immutable
28-
- run: yarn run build
29-
- run: yarn run lint
30-
- run: yarn run coverage
26+
cache: "npm"
27+
- run: npm ci
28+
- run: npm run build
29+
- run: npm run lint
30+
- run: npm run coverage
3131
- name: Publish code coverage to CodeClimate
3232
uses: paambaati/[email protected]
3333
env:

.github/workflows/prettier.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ jobs:
1414
- uses: actions/setup-node@v4
1515
with:
1616
node-version: 16
17-
- run: corepack enable
18-
- run: yarn install --immutable
17+
cache: "npm"
18+
- run: npm ci
1919
- name: Run prettier
2020
run: |-
21-
yarn run format:check
21+
npm run format:check

.github/workflows/release.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,10 @@ jobs:
1919
uses: actions/setup-node@v4
2020
with:
2121
node-version: "lts/*"
22-
- run: corepack enable
2322
- name: Install dependencies
24-
run: yarn install --immutable
23+
run: npm ci
2524
- name: Build
26-
run: yarn run build
25+
run: npm run build
2726
- name: Import GPG key
2827
id: import_gpg
2928
uses: crazy-max/ghaction-import-gpg@v5
@@ -40,4 +39,4 @@ jobs:
4039
GIT_COMMITTER_EMAIL: ${{ steps.import_gpg.outputs.email }}
4140
DOCKER_REGISTRY_USER: ${{ secrets.DOCKERHUB_USERNAME }}
4241
DOCKER_REGISTRY_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
43-
run: yarn dlx semantic-release
42+
run: npx semantic-release

.gitignore

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,3 @@ npm-debug.log
2020
.idea
2121
.cache
2222
.vscode
23-
24-
# YARN
25-
.pnp.*
26-
.yarn/*
27-
!.yarn/patches
28-
!.yarn/plugins
29-
!.yarn/releases
30-
!.yarn/sdks
31-
!.yarn/versions

.yarnrc.yml

Lines changed: 0 additions & 9 deletions
This file was deleted.

Dockerfile

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,17 @@ ARG TARGETPLATFORM
33
ARG BUILDPLATFORM
44
RUN mkdir /peer-server
55
WORKDIR /peer-server
6-
COPY package.json yarn.lock .yarnrc.yml ./
7-
RUN corepack install && corepack enable
8-
RUN yarn install --immutable
9-
COPY . .
10-
RUN yarn run build
11-
RUN yarn run test
6+
COPY package.json package-lock.json ./
7+
RUN npm clean-install
8+
COPY . ./
9+
RUN npm run build
10+
RUN npm run test
1211

1312
FROM docker.io/library/node:18.20.0-alpine as production
1413
RUN mkdir /peer-server
1514
WORKDIR /peer-server
16-
COPY package.json yarn.lock .yarnrc.yml ./
17-
RUN corepack install && corepack enable
18-
RUN yarn workspaces focus --all --production
15+
COPY package.json package-lock.json ./
16+
RUN npm clean-install --omit=dev
1917
COPY --from=build /peer-server/dist/bin/peerjs.js ./
2018
ENV PORT 9000
2119
EXPOSE ${PORT}

0 commit comments

Comments
 (0)