Skip to content

Commit

Permalink
fix: Possible fix for Github actions stuck v4
Browse files Browse the repository at this point in the history
  • Loading branch information
RARgames committed Dec 30, 2023
1 parent 14da603 commit 7aa766b
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-and-push-docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
uses: docker/[email protected]
with:
context: .
platforms: linux/amd64,linux/arm64,linux/arm/v7
platforms: linux/amd64,linux/arm64
push: true
tags: |
ghcr.io/rargames/4gaboards:latest
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ WORKDIR /app

COPY server/package.json server/package-lock.json .

RUN exec sh && npm install npm@latest --global
RUN exec sh && npm install pnpm --global
RUN npm install npm@latest --global
RUN npm install pnpm --global
RUN pnpm import
RUN pnpm install --prod

Expand All @@ -15,8 +15,8 @@ WORKDIR /app

COPY client/package.json client/package-lock.json .

RUN exec sh && npm install npm@latest --global
RUN exec sh && npm install pnpm --global
RUN npm install npm@latest --global
RUN npm install pnpm --global
RUN pnpm import
RUN pnpm install --prod

Expand Down
2 changes: 0 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
"client:start": "npm start --prefix client",
"client:test": "npm test --prefix client",
"docker:build": "docker build -t ghcr.io/rargames/4gaboards:local -f Dockerfile .",
"docker:build:local": "docker build -t ghcr.io/rargames/4gaboards:local -f Dockerfile.local .",
"docker:build:base": "docker build -t ghcr.io/rargames/4gaboards:base-local -f Dockerfile.base .",
"postinstall": "(cd server && npm i && cd ../client && npm i)",
"lint": "npm run server:lint && npm run client:lint",
"prepare": "husky install",
Expand Down

0 comments on commit 7aa766b

Please sign in to comment.