Skip to content

Commit

Permalink
Revert "Merge branch 'jonas/pjs-2065-support-multiple-docker-image-ar…
Browse files Browse the repository at this point in the history
…chitectures' into rc"

This reverts commit fd16d4c, reversing
changes made to 9457cc2.
  • Loading branch information
jonasgloning committed May 4, 2024
1 parent 3b07ba7 commit f4890d7
Show file tree
Hide file tree
Showing 9 changed files with 14,251 additions and 10,379 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:

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

steps:
Expand All @@ -23,11 +23,11 @@ jobs:
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- run: corepack enable
- run: yarn install --immutable
- run: yarn run build
- run: yarn run lint
- run: yarn run coverage
cache: "npm"
- run: npm ci
- run: npm run build
- run: npm run lint
- run: npm run coverage
- name: Publish code coverage to CodeClimate
uses: paambaati/codeclimate-action@v5.0.0
env:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/prettier.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ jobs:
- uses: actions/setup-node@v4
with:
node-version: 16
- run: corepack enable
- run: yarn install --immutable
cache: "npm"
- run: npm ci
- name: Run prettier
run: |-
yarn run format:check
npm run format:check
7 changes: 3 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,10 @@ jobs:
uses: actions/setup-node@v4
with:
node-version: "lts/*"
- run: corepack enable
- name: Install dependencies
run: yarn install --immutable
run: npm ci
- name: Build
run: yarn run build
run: npm run build
- name: Import GPG key
id: import_gpg
uses: crazy-max/ghaction-import-gpg@v5
Expand All @@ -40,4 +39,4 @@ jobs:
GIT_COMMITTER_EMAIL: ${{ steps.import_gpg.outputs.email }}
DOCKER_REGISTRY_USER: ${{ secrets.DOCKERHUB_USERNAME }}
DOCKER_REGISTRY_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
run: yarn dlx semantic-release
run: npx semantic-release
9 changes: 0 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,3 @@ npm-debug.log
.idea
.cache
.vscode

# YARN
.pnp.*
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions
9 changes: 0 additions & 9 deletions .yarnrc.yml

This file was deleted.

16 changes: 7 additions & 9 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,17 @@ ARG TARGETPLATFORM
ARG BUILDPLATFORM
RUN mkdir /peer-server
WORKDIR /peer-server
COPY package.json yarn.lock .yarnrc.yml ./
RUN corepack install && corepack enable
RUN yarn install --immutable
COPY . .
RUN yarn run build
RUN yarn run test
COPY package.json package-lock.json ./
RUN npm clean-install
COPY . ./
RUN npm run build
RUN npm run test

FROM docker.io/library/node:18.20.0-alpine as production
RUN mkdir /peer-server
WORKDIR /peer-server
COPY package.json yarn.lock .yarnrc.yml ./
RUN corepack install && corepack enable
RUN yarn workspaces focus --all --production
COPY package.json package-lock.json ./
RUN npm clean-install --omit=dev
COPY --from=build /peer-server/dist/bin/peerjs.js ./
ENV PORT 9000
EXPOSE ${PORT}
Expand Down
Loading

0 comments on commit f4890d7

Please sign in to comment.