-
Notifications
You must be signed in to change notification settings - Fork 0
feat: publish worker images for both Aurora services #9
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
Merged
+210
−10
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,185 @@ | ||
| name: release | ||
|
|
||
| # One repo, TWO worker images (aurora-postgres-server + aurora-postgres-db), one | ||
| # chained run: release-please cuts the version once, the release-publish-oci | ||
| # chain builds/pushes/registers the SERVER image, and a parallel pair of jobs | ||
| # does the same for the DB image against the same tag — both artifacts end up | ||
| # in the release notes. | ||
| # | ||
| # Chained on purpose: release-please creates tags with GITHUB_TOKEN, and | ||
| # GitHub never triggers workflows from bot-token events. | ||
| # | ||
| # Recovery / backfill: dispatch with existing_tag to publish + finalize a tag | ||
| # that already exists. | ||
| # | ||
| # Configure: secrets AWS_ROLE_ARN_ECR_PUSH + ARTIFACT_NP_API_KEY, variable | ||
| # NP_ARTIFACT_NRN. | ||
| on: | ||
| push: | ||
| branches: | ||
| - main | ||
| workflow_dispatch: | ||
| inputs: | ||
| existing_tag: | ||
| description: 'Publish + finalize an existing tag (recovery/backfill)' | ||
| required: true | ||
| type: string | ||
|
|
||
| permissions: | ||
| contents: write | ||
| pull-requests: write | ||
| id-token: write # OIDC auth against AWS for the ECR pushes | ||
|
|
||
| jobs: | ||
| # Server image rides the full chain: release-please + build + push + | ||
| # artifact registration + release finalize. | ||
| release: | ||
| uses: nullplatform/actions-nullplatform/.github/workflows/release.yml@main | ||
| secrets: inherit | ||
| uses: nullplatform/actions-nullplatform/.github/workflows/release-publish-oci.yml@v1.4.0 | ||
| with: | ||
| image_name: services/aurora-postgres-server | ||
| dockerfile: Dockerfile.aurora-postgres-server | ||
| existing_tag: ${{ inputs.existing_tag || '' }} | ||
| secrets: | ||
| aws_role_arn: ${{ secrets.AWS_ROLE_ARN_ECR_PUSH }} | ||
| artifact_np_api_key: ${{ secrets.ARTIFACT_NP_API_KEY }} | ||
|
|
||
| # DB image: same tag, built inline (a second reusable call to the same | ||
| # workflow file at a different ref made the run fail at startup; an inline | ||
| # buildx job sidesteps it and mirrors what the chain's build does). | ||
| publish_db: | ||
| name: Build & push aurora-postgres-db | ||
| needs: release | ||
| if: ${{ !cancelled() && (needs.release.outputs.release_created == 'true' || inputs.existing_tag != '') }} | ||
| runs-on: ubuntu-24.04 | ||
| outputs: | ||
| image_digest: ${{ steps.build.outputs.digest }} | ||
| env: | ||
| IMAGE: public.ecr.aws/nullplatform/services/aurora-postgres-db | ||
| TAG: ${{ inputs.existing_tag || needs.release.outputs.tag_name }} | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| with: | ||
| ref: ${{ inputs.existing_tag || needs.release.outputs.tag_name }} | ||
| - uses: docker/setup-qemu-action@v3 | ||
| - uses: docker/setup-buildx-action@v3 | ||
| - uses: aws-actions/configure-aws-credentials@v4 | ||
| with: | ||
| role-to-assume: ${{ secrets.AWS_ROLE_ARN_ECR_PUSH }} | ||
| aws-region: us-east-1 | ||
| - name: Login to ECR Public | ||
| run: aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws | ||
| - name: Build and push | ||
| id: build | ||
| run: | | ||
| docker buildx build \ | ||
| --platform linux/amd64,linux/arm64 \ | ||
| -f Dockerfile.aurora-postgres-db \ | ||
| -t "$IMAGE:$TAG" \ | ||
| --push . | ||
| DIGEST=$(docker buildx imagetools inspect "$IMAGE:$TAG" --format '{{json .Manifest.Digest}}' | tr -d '"') | ||
| echo "digest=$DIGEST" >> "$GITHUB_OUTPUT" | ||
| echo "pushed $IMAGE:$TAG @ $DIGEST" | ||
|
|
||
| # ...and its own artifact registration + release-notes row (the chain | ||
| # registers one image per run; this repo ships two from one version). | ||
| finalize_db: | ||
| name: Register db artifact & append to release | ||
| needs: [release, publish_db] | ||
| if: ${{ !cancelled() && needs.publish_db.result == 'success' }} | ||
| runs-on: ubuntu-24.04 | ||
| env: | ||
| GH_TOKEN: ${{ github.token }} | ||
| TAG: ${{ inputs.existing_tag || needs.release.outputs.tag_name }} | ||
| DIGEST: ${{ needs.publish_db.outputs.image_digest }} | ||
| ECR_REGISTRY: public.ecr.aws/nullplatform | ||
| IMAGE_NAME: services/aurora-postgres-db | ||
| steps: | ||
| - name: Register oci_image artifact (db) | ||
| id: artifact | ||
| env: | ||
| NULLPLATFORM_API_KEY: ${{ secrets.ARTIFACT_NP_API_KEY }} | ||
| NP_ARTIFACT_NRN: ${{ vars.NP_ARTIFACT_NRN }} | ||
| run: | | ||
| set -o pipefail | ||
| if [ -z "$NULLPLATFORM_API_KEY" ]; then | ||
| echo "::error::ARTIFACT_NP_API_KEY secret is empty or not set" | ||
| exit 1 | ||
| fi | ||
| if [ -z "$NP_ARTIFACT_NRN" ]; then | ||
| echo "::error::NP_ARTIFACT_NRN variable is not set" | ||
| exit 1 | ||
| fi | ||
| curl -fsSL https://cli.nullplatform.com/install.sh | VERSION=alpha sh | ||
| export PATH="$HOME/.local/bin:$PATH" | ||
|
|
||
| # Annotations are last-write-wins full replacement on the revision, so | ||
| # every run sends the complete set: the release-please notes as the | ||
| # curated changelog plus the OCI source/revision/version keys. The | ||
| # release body is truncated at its first '## Artifact' section so a | ||
| # backfill re-run never feeds the appended artifact tables back in. | ||
| EXTRA_ARGS=() | ||
| RELEASE_BODY=$(gh api "repos/$GITHUB_REPOSITORY/releases/tags/$TAG" --jq '.body // ""' 2>/dev/null || true) | ||
| printf '%s' "$RELEASE_BODY" | sed '/^## Artifact/,$d' > changelog.md | ||
| if grep -q '[^[:space:]]' changelog.md; then | ||
| EXTRA_ARGS+=(--changelog-file changelog.md) | ||
| fi | ||
| # The image was built from the tag's commit, not the triggering sha | ||
| # (they differ on existing_tag backfills). | ||
| TAG_COMMIT=$(gh api "repos/$GITHUB_REPOSITORY/commits/$TAG" --jq '.sha' 2>/dev/null || true) | ||
| if [ -n "$TAG_COMMIT" ]; then | ||
| EXTRA_ARGS+=(--annotation "org.opencontainers.image.revision=$TAG_COMMIT") | ||
| fi | ||
|
|
||
| REG_HOST="${ECR_REGISTRY%%/*}" | ||
| REPOSITORY="${ECR_REGISTRY#*/}/$IMAGE_NAME" | ||
| OUTPUT=$(np artifact create \ | ||
| --nrn "$NP_ARTIFACT_NRN" \ | ||
| --type oci_image \ | ||
| --registry "$REG_HOST" \ | ||
| --repository "$REPOSITORY" \ | ||
| --digest "$DIGEST" \ | ||
| --tag "$TAG" \ | ||
| --annotation "org.opencontainers.image.source=${{ github.server_url }}/$GITHUB_REPOSITORY" \ | ||
| --annotation "org.opencontainers.image.version=$TAG" \ | ||
| "${EXTRA_ARGS[@]}" \ | ||
| --visible-to "organization=*" \ | ||
| --format json) | ||
| echo "$OUTPUT" | ||
| ARTIFACT_ID=$(echo "$OUTPUT" | jq -r '.id // empty' || true) | ||
| [ -z "$ARTIFACT_ID" ] && ARTIFACT_ID="registered (id unavailable)" | ||
| echo "artifact_id=$ARTIFACT_ID" >> "$GITHUB_OUTPUT" | ||
|
|
||
| - name: Append db artifact metadata to the release | ||
| if: ${{ !cancelled() }} | ||
| env: | ||
| ARTIFACT_ID: ${{ steps.artifact.outputs.artifact_id }} | ||
| REGISTER_RESULT: ${{ steps.artifact.outcome }} | ||
| run: | | ||
| IMAGE="$ECR_REGISTRY/$IMAGE_NAME" | ||
| case "$REGISTER_RESULT" in | ||
| success) ID_ROW="${ARTIFACT_ID}" ;; | ||
| *) ID_ROW="registration failed — see run log" ;; | ||
| esac | ||
|
|
||
| RELEASE_ID=$(gh api "repos/$GITHUB_REPOSITORY/releases/tags/$TAG" --jq '.id' 2>/dev/null || true) | ||
| if [ -z "$RELEASE_ID" ]; then | ||
| RELEASE_ID=$(gh api "repos/$GITHUB_REPOSITORY/releases" --paginate \ | ||
| --jq "[.[] | select(.tag_name==\"$TAG\")][0].id // empty") | ||
| fi | ||
| if [ -z "$RELEASE_ID" ]; then | ||
| echo "::warning::no release found for $TAG; skipping the append" | ||
| exit 0 | ||
| fi | ||
|
|
||
| # shellcheck disable=SC2016 | ||
| SECTION=$(printf '## Artifact (aurora-postgres-db)\n\n| | |\n|---|---|\n| Image | `%s` |\n| Digest | `%s` |\n| Pinned reference | `%s` |\n| Artifact ID | `%s` |' \ | ||
| "$IMAGE:$TAG" "$DIGEST" "$IMAGE@$DIGEST" "$ID_ROW") | ||
|
|
||
| BODY=$(gh api "repos/$GITHUB_REPOSITORY/releases/$RELEASE_ID" --jq '.body // ""') | ||
| if ! printf '%s' "$BODY" | grep -qF "$DIGEST"; then | ||
| BODY=$(printf '%s\n\n%s' "$BODY" "$SECTION") | ||
| fi | ||
| printf '%s' "$BODY" > body.md | ||
| gh api -X PATCH "repos/$GITHUB_REPOSITORY/releases/$RELEASE_ID" \ | ||
| -F draft=false -F "body=@body.md" > /dev/null | ||
| echo "db artifact appended to release $TAG" |
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| # syntax=docker/dockerfile:1 | ||
|
agustincelentano marked this conversation as resolved.
Dismissed
|
||
| # | ||
| # aurora-postgres-db service worker image — same base and tooling as the server | ||
| # image, plus the postgres client its provisioning scripts drive with psql | ||
| # (aurora-postgres-db/scripts/aws/reassign_owned). | ||
| FROM public.ecr.aws/nullplatform/scopes/worker-bridge:1.0.0 | ||
|
|
||
| RUN apk add --no-cache aws-cli gomplate postgresql16-client | ||
|
|
||
| ARG TOFU_VERSION=1.10.10 | ||
| ARG TARGETARCH | ||
| RUN curl -fsSL "https://github.com/opentofu/opentofu/releases/download/v${TOFU_VERSION}/tofu_${TOFU_VERSION}_linux_${TARGETARCH}.tar.gz" \ | ||
| | tar -xz -C /usr/local/bin tofu \ | ||
| && tofu version | ||
|
|
||
| COPY . /app/pkg | ||
| ENV NP_PACKAGE_NAME=aurora-postgres-db \ | ||
| NP_SERVICE_PATH=/app/pkg/aurora-postgres-db \ | ||
| NP_SCOPE_ENTRYPOINT=/app/pkg/aurora-postgres-db/entrypoint/entrypoint | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| # syntax=docker/dockerfile:1 | ||
|
agustincelentano marked this conversation as resolved.
Dismissed
agustincelentano marked this conversation as resolved.
Dismissed
|
||
| # | ||
| # aurora-postgres-server service worker image — built on the lean gRPC worker | ||
| # bridge, with the cloud tooling the Aurora server workflows need baked in. | ||
| FROM public.ecr.aws/nullplatform/scopes/worker-bridge:1.0.0 | ||
|
|
||
| RUN apk add --no-cache aws-cli gomplate | ||
|
|
||
| # OpenTofu >= 1.10 (S3 backend with use_lockfile); alpine packages 1.7.x. | ||
| ARG TOFU_VERSION=1.10.10 | ||
| ARG TARGETARCH | ||
| RUN curl -fsSL "https://github.com/opentofu/opentofu/releases/download/v${TOFU_VERSION}/tofu_${TOFU_VERSION}_linux_${TARGETARCH}.tar.gz" \ | ||
| | tar -xz -C /usr/local/bin tofu \ | ||
| && tofu version | ||
|
|
||
| COPY . /app/pkg | ||
| ENV NP_PACKAGE_NAME=aurora-postgres-server \ | ||
| NP_SERVICE_PATH=/app/pkg/aurora-postgres-server \ | ||
| NP_SCOPE_ENTRYPOINT=/app/pkg/aurora-postgres-server/entrypoint/entrypoint | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.