diff --git a/containers/homepage/Dockerfile b/containers/homepage/Dockerfile index 450bb36..a3133ad 100644 --- a/containers/homepage/Dockerfile +++ b/containers/homepage/Dockerfile @@ -11,7 +11,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends git ca-certific && rm -rf /var/lib/apt/lists/* RUN git clone --depth 1 --branch ${HOMEPAGE_VERSION} \ - https://forge.ops.eblu.me/eblume/homepage.git /app + https://forge.ops.eblu.me/mirrors/homepage.git /app WORKDIR /app RUN mkdir -p config \ diff --git a/containers/navidrome/Dockerfile b/containers/navidrome/Dockerfile index 090f7df..285fd06 100644 --- a/containers/navidrome/Dockerfile +++ b/containers/navidrome/Dockerfile @@ -10,7 +10,7 @@ ARG NAVIDROME_VERSION RUN apk add --no-cache git RUN git clone --depth 1 --branch ${NAVIDROME_VERSION} \ - https://forge.ops.eblu.me/eblume/navidrome.git /app + https://forge.ops.eblu.me/mirrors/navidrome.git /app WORKDIR /app/ui RUN npm ci @@ -22,7 +22,7 @@ ARG NAVIDROME_VERSION RUN apk add --no-cache build-base git taglib-dev zlib-dev RUN git clone --depth 1 --branch ${NAVIDROME_VERSION} \ - https://forge.ops.eblu.me/eblume/navidrome.git /app + https://forge.ops.eblu.me/mirrors/navidrome.git /app WORKDIR /app diff --git a/containers/ntfy/Dockerfile b/containers/ntfy/Dockerfile index 6bc2028..3fa5c30 100644 --- a/containers/ntfy/Dockerfile +++ b/containers/ntfy/Dockerfile @@ -12,7 +12,7 @@ RUN apk add --no-cache git RUN mkdir /app && cd /app \ && git init \ - && git remote add origin https://forge.ops.eblu.me/eblume/ntfy.git \ + && git remote add origin https://forge.ops.eblu.me/mirrors/ntfy.git \ && git fetch --depth 1 origin ${NTFY_COMMIT} \ && git checkout FETCH_HEAD @@ -28,7 +28,7 @@ RUN apk add --no-cache build-base git RUN mkdir /app && cd /app \ && git init \ - && git remote add origin https://forge.ops.eblu.me/eblume/ntfy.git \ + && git remote add origin https://forge.ops.eblu.me/mirrors/ntfy.git \ && git fetch --depth 1 origin ${NTFY_COMMIT} \ && git checkout FETCH_HEAD diff --git a/containers/ntfy/default.nix b/containers/ntfy/default.nix index b3435da..5164bba 100644 --- a/containers/ntfy/default.nix +++ b/containers/ntfy/default.nix @@ -7,7 +7,7 @@ let version = "2.17.0"; src = pkgs.fetchgit { - url = "https://forge.ops.eblu.me/eblume/ntfy.git"; + url = "https://forge.ops.eblu.me/mirrors/ntfy.git"; rev = "v${version}"; hash = "sha256-/dxILAkye1HwYcybnx1WrMRK2jXZMrxal2ZKm6y2bWc="; }; diff --git a/docs/changelog.d/feature-mirror-org-migration.infra.md b/docs/changelog.d/feature-mirror-org-migration.infra.md new file mode 100644 index 0000000..e201c2e --- /dev/null +++ b/docs/changelog.d/feature-mirror-org-migration.infra.md @@ -0,0 +1 @@ +Migrate upstream mirror repos from `eblume/` to `mirrors/` Forgejo organization diff --git a/docs/how-to/plans/migrate-forgejo-from-brew.md b/docs/how-to/plans/migrate-forgejo-from-brew.md index 545d75e..3a77154 100644 --- a/docs/how-to/plans/migrate-forgejo-from-brew.md +++ b/docs/how-to/plans/migrate-forgejo-from-brew.md @@ -32,7 +32,7 @@ https://codeberg.org/forgejo/forgejo.git Add the forge mirror as a secondary remote for convenience and backup: ``` -https://forge.ops.eblu.me/eblume/forgejo.git +https://forge.ops.eblu.me/mirrors/forgejo.git ``` ## One-Time Migration Steps @@ -48,7 +48,7 @@ ssh indri 'git clone https://codeberg.org/forgejo/forgejo.git ~/code/3rd/forgejo ### 2. Add Forge Mirror as Secondary Remote ```fish -ssh indri 'cd ~/code/3rd/forgejo && git remote add forge https://forge.ops.eblu.me/eblume/forgejo.git' +ssh indri 'cd ~/code/3rd/forgejo && git remote add forge https://forge.ops.eblu.me/mirrors/forgejo.git' ``` ### 3. Check Out the Desired Version Tag @@ -155,7 +155,7 @@ Replace brew install/start with binary-check + LaunchAgent pattern (matching `an # ssh indri 'git clone https://codeberg.org/forgejo/forgejo.git ~/code/3rd/forgejo' # # 2. Add forge mirror as secondary remote: -# ssh indri 'cd ~/code/3rd/forgejo && git remote add forge https://forge.ops.eblu.me/eblume/forgejo.git' +# ssh indri 'cd ~/code/3rd/forgejo && git remote add forge https://forge.ops.eblu.me/mirrors/forgejo.git' # # 3. Set up Go and Node via mise: # ssh indri 'cd ~/code/3rd/forgejo && mise use go@1.24 node@20' diff --git a/docs/how-to/plans/upstream-fork-strategy.md b/docs/how-to/plans/upstream-fork-strategy.md index 2efc539..b2ce412 100644 --- a/docs/how-to/plans/upstream-fork-strategy.md +++ b/docs/how-to/plans/upstream-fork-strategy.md @@ -177,7 +177,7 @@ This branch is maintained independently — it does not participate in the daily Quartz (the documentation site generator) is the planned first fork and the primary motivation for this strategy. - **Upstream:** `https://github.com/jackyzha0/quartz.git` -- **Forge repo:** `forge.ops.eblu.me/eblume/quartz` +- **Forge repo:** `forge.ops.eblu.me/mirrors/quartz` - **Primary branch:** `blumeops` ### BlumeOps-Specific Patches (`blumeops` branch) @@ -209,7 +209,7 @@ This fork directly supports the [[adopt-dagger-ci]] plan. Once the fork exists, # After (using the BlumeOps fork): .with_exec(["git", "clone", "--depth=1", "--branch=blumeops", - "https://forge.ops.eblu.me/eblume/quartz.git", "/tmp/quartz"]) + "https://forge.ops.eblu.me/mirrors/quartz.git", "/tmp/quartz"]) ``` This means the `build-blumeops.yaml` workflow automatically picks up fork customizations (like `last-reviewed` rendering) when building docs — no separate integration step needed. Local iteration via `dagger call build-docs` also uses the fork, so you can test Quartz customizations against actual BlumeOps content before pushing. diff --git a/docs/how-to/zot/fix-ntfy-nix-version.md b/docs/how-to/zot/fix-ntfy-nix-version.md index 4d444aa..cd08efa 100644 --- a/docs/how-to/zot/fix-ntfy-nix-version.md +++ b/docs/how-to/zot/fix-ntfy-nix-version.md @@ -14,7 +14,7 @@ Override the nixpkgs ntfy-sh derivation to build v2.17.0 from the forge mirror, ## Context -Discovered during [[add-container-version-sync-check]]: the ntfy container has both a Dockerfile and a `default.nix`. The Dockerfile builds v2.17.0 from `forge.ops.eblu.me/eblume/ntfy.git`, but the nix derivation uses `pkgs.ntfy-sh` from nixpkgs which is pinned at 2.15.0. The version sync check currently excludes ntfy from nix version validation as a workaround. +Discovered during [[add-container-version-sync-check]]: the ntfy container has both a Dockerfile and a `default.nix`. The Dockerfile builds v2.17.0 from `forge.ops.eblu.me/mirrors/ntfy.git`, but the nix derivation uses `pkgs.ntfy-sh` from nixpkgs which is pinned at 2.15.0. The version sync check currently excludes ntfy from nix version validation as a workaround. ## What Was Done