diff --git a/.gitea/workflows/build-images.yml b/.gitea/workflows/build-images.yml index d8b18e0..90d16dc 100644 --- a/.gitea/workflows/build-images.yml +++ b/.gitea/workflows/build-images.yml @@ -33,7 +33,7 @@ jobs: build-and-push: runs-on: docker container: - image: git.oblachno.oblachno.fyi/oblachno-oss/runner-images/ci-full:latest + image: git.oblachno.fyi/oblachno-oss/runner-images/ci-full:latest credentials: username: ${{ vars.CI_GITEA_USERNAME }} password: ${{ secrets.CI_GITEA_API_TOKEN }} @@ -68,7 +68,7 @@ jobs: [ -z "$_TOKEN" ] && _TOKEN="$DEVELOPER_GITEA_API_TOKEN" [ -z "$_TOKEN" ] && _TOKEN="$CI_GITEA_TOKEN" if [ -z "$_TOKEN" ]; then echo "Gitea API token not set — skipping Docker login"; exit 1; fi - echo "$_TOKEN" | docker login git.oblachno.oblachno.fyi -u "$CI_GITEA_USERNAME" --password-stdin + echo "$_TOKEN" | docker login git.oblachno.fyi -u "$CI_GITEA_USERNAME" --password-stdin - name: Build and push tier images if: >- github.event_name == 'workflow_dispatch' || @@ -88,21 +88,21 @@ jobs: --dockerfile docker/ci-base/Dockerfile \ --name oblachno-oss/runner-images/ci-base \ --tag latest \ - --registry git.oblachno.oblachno.fyi \ + --registry git.oblachno.fyi \ --push --pull # Build ci-quality (FROM ci-base-latest) python3 -m devx.tools.build_image \ --dockerfile docker/ci-quality/Dockerfile \ --name oblachno-oss/runner-images/ci-quality \ --tag latest \ - --registry git.oblachno.oblachno.fyi \ + --registry git.oblachno.fyi \ --push # Build ci-full (FROM ci-quality-latest) python3 -m devx.tools.build_image \ --dockerfile docker/ci-full/Dockerfile \ --name oblachno-oss/runner-images/ci-full \ --tag latest \ - --registry git.oblachno.oblachno.fyi \ + --registry git.oblachno.fyi \ --push - name: Notify on failure if: failure() @@ -124,7 +124,7 @@ jobs: if: always() && needs.build-and-push.result == 'success' runs-on: docker container: - image: git.oblachno.oblachno.fyi/oblachno-oss/runner-images/ci-base:latest + image: git.oblachno.fyi/oblachno-oss/runner-images/ci-base:latest credentials: username: ${{ vars.CI_GITEA_USERNAME }} password: ${{ secrets.CI_GITEA_API_TOKEN }} diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 6d66c5f..f392916 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: validate: runs-on: docker container: - image: git.oblachno.oblachno.fyi/oblachno-oss/runner-images/ci-full:latest + image: git.oblachno.fyi/oblachno-oss/runner-images/ci-full:latest credentials: username: ${{ vars.CI_GITEA_USERNAME }} password: ${{ secrets.CI_GITEA_API_TOKEN }} @@ -173,7 +173,7 @@ jobs: needs.validate.result == 'success' runs-on: docker container: - image: git.oblachno.oblachno.fyi/oblachno-oss/runner-images/ci-base:latest + image: git.oblachno.fyi/oblachno-oss/runner-images/ci-base:latest credentials: username: ${{ vars.CI_GITEA_USERNAME }} password: ${{ secrets.CI_GITEA_API_TOKEN }} diff --git a/.gitea/workflows/post-merge.yml b/.gitea/workflows/post-merge.yml index 816153e..f9453c1 100644 --- a/.gitea/workflows/post-merge.yml +++ b/.gitea/workflows/post-merge.yml @@ -41,7 +41,7 @@ jobs: detect-and-configure: runs-on: docker container: - image: git.oblachno.oblachno.fyi/oblachno-oss/runner-images/ci-base:latest + image: git.oblachno.fyi/oblachno-oss/runner-images/ci-base:latest credentials: username: ${{ vars.CI_GITEA_USERNAME }} password: ${{ secrets.CI_GITEA_API_TOKEN }} @@ -109,7 +109,7 @@ jobs: if: always() && needs.detect-and-configure.result == 'success' runs-on: docker container: - image: git.oblachno.oblachno.fyi/oblachno-oss/runner-images/ci-full:latest + image: git.oblachno.fyi/oblachno-oss/runner-images/ci-full:latest credentials: username: ${{ vars.CI_GITEA_USERNAME }} password: ${{ secrets.CI_GITEA_API_TOKEN }} diff --git a/docker/ci-full/Dockerfile b/docker/ci-full/Dockerfile index 729a0e3..fd4aa6f 100644 --- a/docker/ci-full/Dockerfile +++ b/docker/ci-full/Dockerfile @@ -7,7 +7,7 @@ # Layers on top of ci-quality: adds release tools, molecule, deploy deps, # git-cliff, and OpenTofu. -FROM git.oblachno.oblachno.fyi/oblachno-oss/runner-images/ci-quality:latest +FROM git.oblachno.fyi/oblachno-oss/runner-images/ci-quality:latest SHELL ["/bin/bash", "-o", "pipefail", "-c"] diff --git a/docker/ci-quality/Dockerfile b/docker/ci-quality/Dockerfile index 5188395..5aaac7b 100644 --- a/docker/ci-quality/Dockerfile +++ b/docker/ci-quality/Dockerfile @@ -5,7 +5,7 @@ # # Layers on top of ci-base: adds lint tools + actionlint + checkmake. -FROM git.oblachno.oblachno.fyi/oblachno-oss/runner-images/ci-base:latest +FROM git.oblachno.fyi/oblachno-oss/runner-images/ci-base:latest # Install devx[lint] from local source (adds ruff, pyright, bandit, etc.) COPY . /tmp/devx diff --git a/src/devx/ci/cancel_superseded_runs.py b/src/devx/ci/cancel_superseded_runs.py index dc75364..2b557c6 100644 --- a/src/devx/ci/cancel_superseded_runs.py +++ b/src/devx/ci/cancel_superseded_runs.py @@ -117,7 +117,7 @@ def main() -> int: parser.add_argument("--dry-run", action="store_true", help="List without cancelling") parser.add_argument( "--base-url", - default=os.environ.get("GITEA_API_URL", "https://git.oblachno.oblachno.fyi"), + default=os.environ.get("GITEA_API_URL", "https://git.oblachno.fyi"), help="Gitea base URL", ) args = parser.parse_args() diff --git a/src/devx/config.py b/src/devx/config.py index 55d0725..882964c 100644 --- a/src/devx/config.py +++ b/src/devx/config.py @@ -68,8 +68,8 @@ def _get_int(key: str, env_var: str, default: int) -> int: # API endpoints — override via env vars for different Gitea/Vikunja instances -GITEA_API_URL = _get("gitea_api_url", "DEVX_GITEA_API_URL", "https://git.oblachno.oblachno.fyi/api/v1") -VIKUNJA_API_URL = _get("vikunja_api_url", "DEVX_VIKUNJA_API_URL", "https://work.oblachno.oblachno.fyi/api/v1") +GITEA_API_URL = _get("gitea_api_url", "DEVX_GITEA_API_URL", "https://git.oblachno.fyi/api/v1") +VIKUNJA_API_URL = _get("vikunja_api_url", "DEVX_VIKUNJA_API_URL", "https://tasks.oblachno.fyi/api/v1") # Organization defaults — each project MUST set DEVX_REPO_OWNER explicitly. # No default: prevents silent 404s when the wrong owner is used. diff --git a/src/devx/make/devx.mak b/src/devx/make/devx.mak index 8e66123..c144aea 100644 --- a/src/devx/make/devx.mak +++ b/src/devx/make/devx.mak @@ -35,7 +35,7 @@ # DEVX_TYPECHECK_PATHS — paths for pyright (default: empty — uses pyright config) # DEVX_COV_PKG — coverage package name (default: src/devx) # DEVX_TEST_PATHS — pytest paths (default: tests/) -# DEVX_GITEA_PYPI_HOST — Gitea PyPI host (default: git.oblachno.oblachno.fyi) +# DEVX_GITEA_PYPI_HOST — Gitea PyPI host (default: git.oblachno.fyi) # DEVX_GITEA_PYPI_ORG — Gitea PyPI org (default: oblachno-oss) # DEVX_ACTIONLINT_CFG — actionlint config file (default: .gitea/actionlint.yaml) # DEVX_WORKFLOW_DIR — workflow directory (default: .gitea/workflows) @@ -50,7 +50,7 @@ DEVX_BIN ?= $(DEVX_VENV)/bin DEVX_LINT_PATHS ?= src/ tests/ DEVX_COV_PKG ?= src/devx DEVX_TEST_PATHS ?= tests/ -DEVX_GITEA_PYPI_HOST ?= git.oblachno.oblachno.fyi +DEVX_GITEA_PYPI_HOST ?= git.oblachno.fyi DEVX_GITEA_PYPI_ORG ?= oblachno-oss DEVX_ACTIONLINT_CFG ?= .gitea/actionlint.yaml DEVX_WORKFLOW_DIR ?= .gitea/workflows @@ -445,11 +445,11 @@ devx-setup-image: # ── Docker image build / push / cleanup ─────────────────────────────────────── # # Variables: -# DEVX_GITEA_REGISTRY — registry URL (default: git.oblachno.oblachno.fyi) +# DEVX_GITEA_REGISTRY — registry URL (default: git.oblachno.fyi) # DEVX_IMAGE_MANIFEST — path to JSON manifest (default: docker/images.json) # DEVX_IMAGE_OWNER — package owner for cleanup (default: oblachno-oss) -DEVX_GITEA_REGISTRY ?= git.oblachno.oblachno.fyi +DEVX_GITEA_REGISTRY ?= git.oblachno.fyi DEVX_IMAGE_MANIFEST ?= docker/images.json DEVX_IMAGE_OWNER ?= oblachno-oss diff --git a/src/devx/molecule/platforms.py b/src/devx/molecule/platforms.py index 4ddb4e9..06b57bf 100644 --- a/src/devx/molecule/platforms.py +++ b/src/devx/molecule/platforms.py @@ -20,7 +20,7 @@ from pathlib import Path PLATFORMS: list[dict[str, str]] = [ { "name": "ubuntu-2604", - "image": "git.oblachno.oblachno.fyi/oblachno/molecule-test-base:latest", + "image": "git.oblachno.fyi/oblachno/molecule-test-base:latest", "command": "sleep infinity", }, ] diff --git a/src/devx/tools/build_image.py b/src/devx/tools/build_image.py index 8e808d6..b1fda53 100644 --- a/src/devx/tools/build_image.py +++ b/src/devx/tools/build_image.py @@ -22,7 +22,7 @@ Usage:: --dockerfile docker/ci-base/Dockerfile \\ --tag ci-base:latest \\ --tag ci-base:0.19.3 \\ - --registry git.oblachno.oblachno.fyi \\ + --registry git.oblachno.fyi \\ --push # Build multiple images (from a manifest file) diff --git a/src/devx/tools/docker_login.py b/src/devx/tools/docker_login.py index 9e2a77a..3e3adea 100644 --- a/src/devx/tools/docker_login.py +++ b/src/devx/tools/docker_login.py @@ -6,7 +6,7 @@ loading from environment variables. Supports required and optional modes. Usage:: - python3 -m devx.tools.docker_login --registry git.oblachno.oblachno.fyi \\ + python3 -m devx.tools.docker_login --registry git.oblachno.fyi \\ --token-env CI_GITEA_TOKEN --username-env CI_GITEA_USERNAME \\ --default-username emil diff --git a/src/devx/tools/setup.py b/src/devx/tools/setup.py index 777e015..112a7df 100644 --- a/src/devx/tools/setup.py +++ b/src/devx/tools/setup.py @@ -92,7 +92,7 @@ def _configure_tea_login() -> None: click.echo("tea: Gitea API token not set — skipping login configuration.") return - api_url = os.environ.get("DEVX_GITEA_API_URL", "https://git.oblachno.oblachno.fyi/api/v1") + api_url = os.environ.get("DEVX_GITEA_API_URL", "https://git.oblachno.fyi/api/v1") gitea_url = api_url.replace("/api/v1", "") login_name = "devx" diff --git a/src/devx/tools/setup_image.py b/src/devx/tools/setup_image.py index cb3e5e6..f22def3 100644 --- a/src/devx/tools/setup_image.py +++ b/src/devx/tools/setup_image.py @@ -128,7 +128,7 @@ def _fallback_to_setup_ci() -> None: ) @click.option( "--gitea-host", - default="git.oblachno.oblachno.fyi", + default="git.oblachno.fyi", show_default=True, help="Gitea host for the PyPI registry.", )