Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
554c7fad98 | ||
|
|
8c4516d636 | ||
|
|
fbb97f9e37 | ||
|
|
9a92fba85e | ||
|
|
8de3311c26 | ||
|
|
e3281af5f9 | ||
|
|
2670a806ff |
@@ -0,0 +1,85 @@
|
|||||||
|
# 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.nip.io/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.nip.io, 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.nip.io
|
||||||
|
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}}
|
||||||
|
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/internetarchive-feeder/Dockerfile
|
||||||
|
push: true
|
||||||
|
tags: ${{ steps.meta.outputs.tags }}
|
||||||
|
labels: ${{ steps.meta.outputs.labels }}
|
||||||
Generated
+3
-1
@@ -764,7 +764,8 @@ checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "meta-feeder-sdk"
|
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 = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"async-trait",
|
"async-trait",
|
||||||
@@ -773,6 +774,7 @@ dependencies = [
|
|||||||
"bytes",
|
"bytes",
|
||||||
"futures",
|
"futures",
|
||||||
"hyper",
|
"hyper",
|
||||||
|
"libc",
|
||||||
"redb",
|
"redb",
|
||||||
"regex",
|
"regex",
|
||||||
"reqwest",
|
"reqwest",
|
||||||
|
|||||||
@@ -18,9 +18,17 @@ name = "internetarchive-feeder"
|
|||||||
path = "src/main.rs"
|
path = "src/main.rs"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
# TEMPORARY: path dep while the SDK's new rev is unpushed. Flip to:
|
# Pinned by TAG, not rev or path. The tag is the SDK's release identity, and it
|
||||||
# meta-feeder-sdk = { git = "https://github.com/worph/meta-feeder-sdk", rev = "<sha>" }
|
# is the one form every feeder in the fleet can be lined up on.
|
||||||
meta-feeder-sdk = { path = "../../../meta-feeder-sdk" }
|
#
|
||||||
|
# ⚠ 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"] }
|
tokio = { version = "1.40", features = ["full"] }
|
||||||
axum = { version = "0.7", features = ["json"] }
|
axum = { version = "0.7", features = ["json"] }
|
||||||
|
|||||||
@@ -495,6 +495,8 @@ impl InternetArchivePlugin {
|
|||||||
let mut fields: BTreeMap<String, String> = BTreeMap::new();
|
let mut fields: BTreeMap<String, String> = BTreeMap::new();
|
||||||
fields.insert("fileType".to_string(), "audio".to_string());
|
fields.insert("fileType".to_string(), "audio".to_string());
|
||||||
fields.insert("contentKind".to_string(), "track".to_string());
|
fields.insert("contentKind".to_string(), "track".to_string());
|
||||||
|
fields.insert("domain".to_string(), "music".to_string());
|
||||||
|
fields.insert("workForm".to_string(), "standalone".to_string());
|
||||||
fields.insert("title".to_string(), track.title.clone());
|
fields.insert("title".to_string(), track.title.clone());
|
||||||
fields.insert("album".to_string(), item.title.clone());
|
fields.insert("album".to_string(), item.title.clone());
|
||||||
fields.insert("fileName".to_string(), track.file_name.clone());
|
fields.insert("fileName".to_string(), track.file_name.clone());
|
||||||
@@ -590,6 +592,11 @@ impl InternetArchivePlugin {
|
|||||||
let mut fields: BTreeMap<String, String> = BTreeMap::new();
|
let mut fields: BTreeMap<String, String> = BTreeMap::new();
|
||||||
fields.insert("fileType".to_string(), "audio".to_string());
|
fields.insert("fileType".to_string(), "audio".to_string());
|
||||||
fields.insert("contentKind".to_string(), "pack".to_string());
|
fields.insert("contentKind".to_string(), "pack".to_string());
|
||||||
|
// `pack` is ambiguous on both routing axes by construction (season
|
||||||
|
// pack vs album release), so the writer supplies both —
|
||||||
|
// METADATA_KEYS.md §1. An album is a closed work: `standalone`.
|
||||||
|
fields.insert("domain".to_string(), "music".to_string());
|
||||||
|
fields.insert("workForm".to_string(), "standalone".to_string());
|
||||||
fields.insert("title".to_string(), item.title.clone());
|
fields.insert("title".to_string(), item.title.clone());
|
||||||
fields.insert("album".to_string(), item.title.clone());
|
fields.insert("album".to_string(), item.title.clone());
|
||||||
if !item.creator.trim().is_empty() {
|
if !item.creator.trim().is_empty() {
|
||||||
|
|||||||
Reference in New Issue
Block a user