Merge pull request 'ci: use CA-baked plugin-docker-buildx image for artifactapi push' (#6) from benvin/jellyfin-buildx-plugin-image into main
ci/woodpecker/tag/docker Pipeline was successful
ci/woodpecker/tag/docker Pipeline was successful
Reviewed-on: #6
This commit was merged in pull request #6.
This commit is contained in:
+8
-27
@@ -24,44 +24,25 @@ steps:
|
|||||||
memory: 6Gi
|
memory: 6Gi
|
||||||
cpu: 4
|
cpu: 4
|
||||||
|
|
||||||
# Stage the internal (Vault) CA into the shared workspace so the buildkit push
|
|
||||||
# below can verify artifactapi's TLS cert. almalinux9-base already trusts the
|
|
||||||
# unkin CA (it is the image the RPM release pipelines use to reach artifactapi
|
|
||||||
# over HTTPS), so its consolidated trust bundle contains the chain we need.
|
|
||||||
- name: ca-trust
|
|
||||||
image: git.unkin.net/unkin/almalinux9-base:20260606
|
|
||||||
commands:
|
|
||||||
- cp /etc/pki/tls/certs/ca-bundle.crt "$${CI_WORKSPACE}/artifactapi-ca.crt"
|
|
||||||
depends_on: [publish]
|
|
||||||
backend_options:
|
|
||||||
kubernetes:
|
|
||||||
serviceAccountName: default
|
|
||||||
resources:
|
|
||||||
requests:
|
|
||||||
memory: 256Mi
|
|
||||||
cpu: 250m
|
|
||||||
limits:
|
|
||||||
memory: 512Mi
|
|
||||||
cpu: 1
|
|
||||||
|
|
||||||
# Build the runtime image and push it to the artifactapi local docker registry.
|
# Build the runtime image and push it to the artifactapi local docker registry.
|
||||||
# buildkit_config points buildkit at the staged CA so the TLS handshake with
|
# The plugin image bakes artifactapi's internal (Vault) CA at
|
||||||
# artifactapi (Vault-signed cert) verifies; buildx copies the referenced CA
|
# /etc/docker/certs.d/<registry>/ca.crt; buildkit_config points the buildx
|
||||||
# into the buildkitd container under /etc/buildkit/certs when it creates the
|
# docker-container builder at that in-image CA. buildkitd runs in its own
|
||||||
# builder. CI_WORKSPACE is runtime-only so the path is the fixed workspace path.
|
# container and performs the push, so it needs the CA via --config even though
|
||||||
|
# the plugin image already trusts it — buildx copies the referenced file in.
|
||||||
- name: docker
|
- name: docker
|
||||||
image: woodpeckerci/plugin-docker-buildx
|
image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/plugin-docker-buildx:latest
|
||||||
settings:
|
settings:
|
||||||
registry: artifactapi.k8s.syd1.au.unkin.net
|
registry: artifactapi.k8s.syd1.au.unkin.net
|
||||||
repo: artifactapi.k8s.syd1.au.unkin.net/docker-internal/jellyfin-ha
|
repo: artifactapi.k8s.syd1.au.unkin.net/docker-internal/jellyfin-ha
|
||||||
dockerfile: Dockerfile.runtime
|
dockerfile: Dockerfile.runtime
|
||||||
buildkit_config: |
|
buildkit_config: |
|
||||||
[registry."artifactapi.k8s.syd1.au.unkin.net"]
|
[registry."artifactapi.k8s.syd1.au.unkin.net"]
|
||||||
ca = ["/woodpecker/src/git.unkin.net/unkin/jellyfin-ha/artifactapi-ca.crt"]
|
ca = ["/etc/docker/certs.d/artifactapi.k8s.syd1.au.unkin.net/ca.crt"]
|
||||||
tags:
|
tags:
|
||||||
- ${CI_COMMIT_TAG}
|
- ${CI_COMMIT_TAG}
|
||||||
- latest
|
- latest
|
||||||
depends_on: [ca-trust]
|
depends_on: [publish]
|
||||||
backend_options:
|
backend_options:
|
||||||
kubernetes:
|
kubernetes:
|
||||||
serviceAccountName: default
|
serviceAccountName: default
|
||||||
|
|||||||
Reference in New Issue
Block a user