Skip to content

Commit 9d11710

Browse files
authored
Merge pull request #1539 from atsign-foundation/multibuild-set-npm-version
2 parents 86fda4e + 4cb7469 commit 9d11710

File tree

2 files changed

+4
-12
lines changed

2 files changed

+4
-12
lines changed

.github/workflows/multibuild.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,9 @@ jobs:
7777
- uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
7878
with:
7979
node-version: '20.17.0'
80+
# setup required npm version
81+
- run: |
82+
npm install -g [email protected]
8083
# create directories need for build
8184
- run: |
8285
mkdir -p sshnp/web/admin

tools/multibuild/Dockerfile.package

+1-12
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@ FROM atsigncompany/buildimage:3.5.4@sha256:0d21c9f6dc856f1e3df933b99dd88a4833057
66
# See https://github.com/atsign-company/at_dockerfiles for source and automated builds
77
WORKDIR /noports
88

9-
# install node for later (keep at the top file to increase cache hits)
10-
# hadolint ignore=DL3008
11-
RUN apt-get update; \
12-
apt-get install -y --no-install-recommends npm
13-
149
COPY . .
1510

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

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

42-
# Build apps/admin/webapp
43-
WORKDIR /noports/apps/admin/webapp
44-
RUN npm ci; \
45-
npm run build; \
46-
mkdir -p /sshnp/web/admin; \
47-
cp -r ./dist/* /sshnp/web/admin/
48-
4938
RUN set -eux; \
5039
case "$(dpkg --print-architecture)" in \
5140
amd64) ARCH="x64";; \

0 commit comments

Comments
 (0)