Skip to content

Commit

Permalink
Merge pull request #1539 from atsign-foundation/multibuild-set-npm-ve…
Browse files Browse the repository at this point in the history
…rsion
  • Loading branch information
gkc authored Nov 17, 2024
2 parents 86fda4e + 4cb7469 commit 9d11710
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 12 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/multibuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@ jobs:
- uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
with:
node-version: '20.17.0'
# setup required npm version
- run: |
npm install -g [email protected]
# create directories need for build
- run: |
mkdir -p sshnp/web/admin
Expand Down
13 changes: 1 addition & 12 deletions tools/multibuild/Dockerfile.package
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,6 @@ FROM atsigncompany/buildimage:3.5.4@sha256:0d21c9f6dc856f1e3df933b99dd88a4833057
# See https://github.com/atsign-company/at_dockerfiles for source and automated builds
WORKDIR /noports

# install node for later (keep at the top file to increase cache hits)
# hadolint ignore=DL3008
RUN apt-get update; \
apt-get install -y --no-install-recommends npm

COPY . .

# Build packages/dart/sshnoports
Expand All @@ -35,17 +30,11 @@ RUN set -eux; \
cp LICENSE /sshnp/;

# Build apps/admin/admin_api - BETA
# Note: Only the API; webapp only included in the main platform builds
WORKDIR /noports/apps/admin/admin_api
RUN dart pub get --enforce-lockfile; \
dart compile exe bin/np_admin.dart -v -o /sshnp/np_admin

# Build apps/admin/webapp
WORKDIR /noports/apps/admin/webapp
RUN npm ci; \
npm run build; \
mkdir -p /sshnp/web/admin; \
cp -r ./dist/* /sshnp/web/admin/

RUN set -eux; \
case "$(dpkg --print-architecture)" in \
amd64) ARCH="x64";; \
Expand Down

0 comments on commit 9d11710

Please sign in to comment.