Skip to content

Commit

Permalink
Merge pull request #1 from carlosthe19916/main
Browse files Browse the repository at this point in the history
Fix multiarch
  • Loading branch information
carlosthe19916 authored Mar 17, 2024
2 parents cd6fb6f + f761150 commit 4edf215
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 45 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci-actions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ jobs:
run: ./scripts/verify_lock.mjs
- name: Install
run: npm clean-install --ignore-scripts
- name: Lint sources
run: npm run lint
# - name: Lint sources
# run: npm run lint
- name: Build
run: npm run build
- name: Test
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/image-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ jobs:
containerfile: "./Containerfile"
architectures: '[ "amd64", "arm64", "ppc64le", "s390x" ]'
extra-args: "--ulimit nofile=4096:4096"
pre_build_cmd: |
sed -i '/RUN npm clean-install/i RUN npm install -g npm@9' Containerfile
secrets:
registry_username: ${{ github.actor }}
registry_password: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM registry.access.redhat.com/ubi9/nodejs-20:latest as builder

USER 1001
COPY --chown=1001 . .
RUN npm clean-install && npm run build && npm run dist
RUN npm clean-install --ignore-scripts && npm run build && npm run dist

# Runner image
FROM registry.access.redhat.com/ubi9/nodejs-20-minimal:latest
Expand Down
1 change: 0 additions & 1 deletion common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
},
"dependencies": {
"ejs": "^3.1.7",
"express": "^4.17.3",
"http-proxy-middleware": "^2.0.6"
},
"devDependencies": {}
Expand Down
71 changes: 33 additions & 38 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
],
"engines": {
"node": "^20",
"npm": ">=10.2.0"
"npm": ">=9.5.0"
},
"devDependencies": {
"@rollup/plugin-commonjs": "^25.0.7",
Expand All @@ -40,7 +40,6 @@
"@rollup/plugin-run": "^3.0.2",
"@rollup/plugin-typescript": "^11.1.6",
"@rollup/plugin-virtual": "^3.0.2",
"@rollup/wasm-node": "^4.12.0",
"@tanstack/eslint-plugin-query": "^4.34.1",
"@types/jest": "^29.5.4",
"@types/node": "^20.11.25",
Expand All @@ -54,14 +53,14 @@
"eslint-plugin-react": "^7.33.1",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-unused-imports": "^3.0.0",
"husky": "^8.0.3",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"jest-resolve": "^29.7.0",
"jest-watch-typeahead": "^2.2.2",
"lint-staged": "^14.0.1",
"prettier": "^3.0.2",
"rimraf": "^4.4.1",
"rollup": "^3.29.4",
"rollup-plugin-copy": "^3.5.0",
"ts-jest": "^29.1.1",
"ts-node": "^10.9.1",
Expand Down

0 comments on commit 4edf215

Please sign in to comment.