Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
eed7618104 | ||
|
|
d9f8af49e2 | ||
|
|
5533a33e58 | ||
|
|
1e9ee179cf | ||
|
|
38868f1b2d | ||
|
|
f37f455743 | ||
|
|
50d58d41e1 | ||
|
|
b2c94bdec9 | ||
|
|
00287cc426 | ||
|
|
69921d7435 |
@@ -0,0 +1,88 @@
|
||||
# Gitea twin of .github/workflows/publish.yml. Gitea runs only .gitea/workflows/ once this
|
||||
# folder exists, and GitHub never reads it.
|
||||
#
|
||||
# Publishes to IPCR on watch.nsl.sh instead of ghcr.io:
|
||||
# push ipcr-push-85-17-246-67.ip.nsl.sh/metadec.eth/<repo>:<tag> docker login as metadec.eth with the
|
||||
# IPCR_PUSH_TOKEN secret (the metadec.eth namespace token from the IPCR dashboard)
|
||||
# pull ipcr-watch.nsl.sh/ipns/metadec.eth/metadec.eth/<repo>:<tag> anonymous
|
||||
# The push goes to ipcr-push-85-17-246-67.ip.nsl.sh, the box's own address, not ipcr-push-watch.nsl.sh: Cloudflare fronts
|
||||
# *.watch.nsl.sh and refuses any request over 100 MB (413), which a large image layer is.
|
||||
# That host's certificate is signed by the box's private Mesh Router CA, given to buildkit from
|
||||
# the IPCR_CA_PEM repo variable. docker login would make the job's Docker daemon check the
|
||||
# certificate without that CA, so the login is written straight into ~/.docker/config.json.
|
||||
# The runner's job image (node:22-bookworm) has no docker CLI, so the static one is
|
||||
# installed first; buildx installs itself. No `type=gha` cache: the runner has none.
|
||||
|
||||
name: Publish image
|
||||
|
||||
# Build and push the feeder image to the IPCR (ipcr-push-watch.nsl.sh):
|
||||
# * every push to main -> the moving `main` tag
|
||||
# * every `v*` tag -> semver tags (e.g. v1.0.0 -> 1.0.0, 1.0, 1)
|
||||
# The build context is the repo root (the workspace) so the vendored
|
||||
# `meta-feeder-sdk` path dependency resolves; the Dockerfile lives under
|
||||
# feeder-plugin/paper-feeder/.
|
||||
on:
|
||||
push:
|
||||
branches: [main]
|
||||
tags: ['v*']
|
||||
|
||||
env:
|
||||
REGISTRY: ipcr-push-85-17-246-67.ip.nsl.sh
|
||||
IMAGE_NAME: metadec.eth/${{ github.event.repository.name }}
|
||||
|
||||
jobs:
|
||||
publish:
|
||||
runs-on: ubuntu-latest
|
||||
permissions:
|
||||
contents: read
|
||||
packages: write
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Install Docker CLI
|
||||
run: curl -fsSL https://download.docker.com/linux/static/stable/x86_64/docker-28.5.1.tgz | tar -xz -C /usr/local/bin --strip-components=1 docker/docker
|
||||
|
||||
- name: Trust the Mesh Router CA
|
||||
run: printf '%s\n' "$IPCR_CA_PEM" > /tmp/ipcr-ca.pem
|
||||
env:
|
||||
IPCR_CA_PEM: ${{ vars.IPCR_CA_PEM }}
|
||||
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v3
|
||||
with:
|
||||
version: latest
|
||||
buildkitd-config-inline: |
|
||||
[registry."${{ env.REGISTRY }}"]
|
||||
ca = ["/tmp/ipcr-ca.pem"]
|
||||
|
||||
- name: Log in to IPCR
|
||||
env:
|
||||
IPCR_PUSH_TOKEN: ${{ secrets.IPCR_PUSH_TOKEN }}
|
||||
run: |
|
||||
mkdir -p ~/.docker
|
||||
printf '{"auths":{"%s":{"auth":"%s"}}}\n' "$REGISTRY" "$(printf 'metadec.eth:%s' "$IPCR_PUSH_TOKEN" | base64 -w0)" > ~/.docker/config.json
|
||||
|
||||
- name: Extract image metadata
|
||||
id: meta
|
||||
uses: docker/metadata-action@v5
|
||||
with:
|
||||
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
|
||||
tags: |
|
||||
type=ref,event=branch
|
||||
type=semver,pattern={{version}}
|
||||
# A fix to release 1.2.3 is tagged v1.2.3.1: four numbers are not semver, so
|
||||
# the pattern above makes no tag for it; this one does (image tag 1.2.3.1).
|
||||
type=match,pattern=v(\d+\.\d+\.\d+\.\d+),group=1
|
||||
type=semver,pattern={{major}}.{{minor}}
|
||||
type=semver,pattern={{major}}
|
||||
type=sha,format=short
|
||||
|
||||
- name: Build and push
|
||||
uses: docker/build-push-action@v6
|
||||
with:
|
||||
context: .
|
||||
file: ./feeder-plugin/musicbrainz-feeder/Dockerfile
|
||||
push: true
|
||||
tags: ${{ steps.meta.outputs.tags }}
|
||||
labels: ${{ steps.meta.outputs.labels }}
|
||||
@@ -43,6 +43,9 @@ jobs:
|
||||
tags: |
|
||||
type=ref,event=branch
|
||||
type=semver,pattern={{version}}
|
||||
# A fix to release 1.2.3 is tagged v1.2.3.1: four numbers are not semver, so
|
||||
# the pattern above makes no tag for it; this one does (image tag 1.2.3.1).
|
||||
type=match,pattern=v(\d+\.\d+\.\d+\.\d+),group=1
|
||||
type=semver,pattern={{major}}.{{minor}}
|
||||
type=semver,pattern={{major}}
|
||||
type=sha,format=short
|
||||
|
||||
Generated
+3
-1
@@ -742,7 +742,8 @@ checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98"
|
||||
|
||||
[[package]]
|
||||
name = "meta-feeder-sdk"
|
||||
version = "0.1.0"
|
||||
version = "1.7.0"
|
||||
source = "git+https://github.com/worph/meta-feeder-sdk?tag=v1.7.0#027917c8cffe7ca43dadcf3b426cc5f69ecc443a"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-trait",
|
||||
@@ -751,6 +752,7 @@ dependencies = [
|
||||
"bytes",
|
||||
"futures",
|
||||
"hyper",
|
||||
"libc",
|
||||
"redb",
|
||||
"regex",
|
||||
"reqwest",
|
||||
|
||||
@@ -18,9 +18,17 @@ name = "musicbrainz-feeder"
|
||||
path = "src/main.rs"
|
||||
|
||||
[dependencies]
|
||||
# TEMPORARY: path dep while the SDK's new rev is unpushed. Flip to:
|
||||
# meta-feeder-sdk = { git = "https://github.com/worph/meta-feeder-sdk", rev = "<sha>" }
|
||||
meta-feeder-sdk = { path = "../../../meta-feeder-sdk" }
|
||||
# Pinned by TAG, not rev or path. The tag is the SDK's release identity, and it
|
||||
# is the one form every feeder in the fleet can be lined up on.
|
||||
#
|
||||
# ⚠ It must never go back to `path = "../../../meta-feeder-sdk"`. That resolves
|
||||
# OUTSIDE this repo, and this repo is the Docker build context — so the image
|
||||
# build died at manifest resolution with a bare "No such file or directory",
|
||||
# and, worse, this crate became unconsumable as a git dependency by anyone
|
||||
# ("no matching package named `meta-feeder-sdk`"), because a consumer's checkout
|
||||
# has no such sibling directory either. A path dep here is not a local
|
||||
# convenience; it is a defect visible to every downstream repo.
|
||||
meta-feeder-sdk = { git = "https://github.com/worph/meta-feeder-sdk", tag = "v1.7.0" }
|
||||
|
||||
tokio = { version = "1.40", features = ["full"] }
|
||||
axum = { version = "0.7", features = ["json"] }
|
||||
|
||||
@@ -262,6 +262,13 @@ impl Card {
|
||||
// is a well-formed query and routing needs no special case.
|
||||
fields.insert("fileType".to_string(), "card".to_string());
|
||||
fields.insert("contentKind".to_string(), self.kind.content_kind().to_string());
|
||||
// Third axis (METADATA_KEYS.md §1): MusicBrainz is the identity graph
|
||||
// that *defines* the music domain, so both card kinds land there.
|
||||
// Literal rather than via `meta_feeder_sdk::domain` — this feeder pins
|
||||
// the SDK by git tag. An album and an artist are both closed works, not
|
||||
// instalments of a run, so the fourth axis is `standalone`.
|
||||
fields.insert("domain".to_string(), "music".to_string());
|
||||
fields.insert("workForm".to_string(), "standalone".to_string());
|
||||
fields.insert("title".to_string(), title.to_string());
|
||||
|
||||
// The id bag. Which field carries the card's own MBID depends on what
|
||||
|
||||
@@ -11,9 +11,9 @@
|
||||
/// application and carry contact information. A 403 here looks exactly like a
|
||||
/// rate-limit and is easy to misdiagnose, so keep this descriptive.
|
||||
pub const USER_AGENT: &str = concat!(
|
||||
"meta-music/",
|
||||
"musicbrainz-feeder/",
|
||||
env!("CARGO_PKG_VERSION"),
|
||||
" ( https://github.com/worph/meta-feeder-music )"
|
||||
" ( https://github.com/worph/meta-feeder-musicbrainz )"
|
||||
);
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
Reference in New Issue
Block a user