Skip to content
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.

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

ci: policy docker build #1310

Merged
merged 4 commits into from
Sep 4, 2024
Merged

Conversation

XavierChanth
Copy link
Member

@XavierChanth XavierChanth commented Sep 4, 2024

- What I did

See https://github.com/atsign-foundation/noports/actions/runs/10708485526

- How I did it

- How to verify it

- Description for the changelog

@XavierChanth XavierChanth self-assigned this Sep 4, 2024
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file was moved to tools/multibuild.yaml

Comment on lines +8 to +11
# 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 link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Install npm for the angular app

dart compile exe bin/activate_cli.dart -v -o /sshnp/at_activate; \
dart compile exe bin/sshnp.dart -v -o /sshnp/sshnp; \
dart compile exe bin/npt.dart -v -o /sshnp/npt; \
dart compile exe bin/npa_file.dart -v -o /sshnp/npa_file; \
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added npa_file build

Comment on lines +35 to +38
# Build apps/admin/admin_api
WORKDIR /noports/apps/admin/admin_api
RUN dart pub get --enforce-lockfile; \
dart compile exe bin/admin_api.dart -v -o /sshnp/admin_api
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dart admin api app

Comment on lines +40 to +45
# Build apps/admin/webapp
WORKDIR /noports/apps/admin/webapp
RUN npm install; \
npm run build; \
mkdir -p /sshnp/web/admin; \
cp -r ./dist /sshnp/web/admin
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Build the angular app

Comment on lines +13 to +16
COPY . .

# Build packages/dart/sshnoports
WORKDIR /noports/packages/dart/sshnoports
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed some pathing here, the new build context is the root of the repo instead of packages/dart so that the apps directory is also within the context (docker context doesn't work with ../ paths)

Comment on lines -174 to -176
defaults:
run:
working-directory: ./packages/dart
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't change working directory anymore, use the root of the repo

@@ -195,15 +200,17 @@ jobs:
uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db # v3.6.1
- if: ${{ ! inputs.main_build_only }}
run: |
docker buildx build -t atsigncompany/sshnptarball -f sshnoports/tools/Dockerfile.package \
docker buildx build -t atsigncompany/sshnptarball -f ./tools/multibuild/Dockerfile.package \
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

New dockerfile path

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Besides the changes noted, the rest of the file is prettier formatting

@XavierChanth XavierChanth marked this pull request as ready for review September 4, 2024 20:14
@gkc gkc merged commit 6a5779d into feat/file-based-policy-service Sep 4, 2024
17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants