Skip to content

build: exclude policy admin webapp assets from the docker distributions #1539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Nov 17, 2024
Merged

build: exclude policy admin webapp assets from the docker distributions #1539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e2e78f1
build: in multibuild.yaml, set required npm version
gkc Nov 17, 2024
abca702
build: in tools/multibuild/Dockerfile.package, set required npm version
gkc Nov 17, 2024
0ed305a
build: fix syntax in tools/multibuild/Dockerfile.package when setting…
gkc Nov 17, 2024
e71ce89
build: Exclude policy admin webapp build from Dockerfile.package
gkc Nov 17, 2024
4cb7469
build: Exclude policy admin webapp build from Dockerfile.package
gkc Nov 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/multibuild.yaml
View file
Open in desktop
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
View file
Open in desktop
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
Loading