diff --git a/.forgejo/workflows/build-container.yaml b/.forgejo/workflows/build-container.yaml index 6533449..7f09630 100644 --- a/.forgejo/workflows/build-container.yaml +++ b/.forgejo/workflows/build-container.yaml @@ -143,14 +143,7 @@ jobs: VERSION=$(grep -m1 '^\s*version\s*=\s*"' "$NIX_FILE" \ | sed 's/.*"\(.*\)".*/\1/' || true) - # Fall back to CONTAINER_APP_VERSION from Dockerfile - if [ -z "$VERSION" ] && [ -f "containers/$CONTAINER/Dockerfile" ]; then - VERSION=$(grep -m1 '^ARG CONTAINER_APP_VERSION=' \ - "containers/$CONTAINER/Dockerfile" \ - | sed 's/^ARG CONTAINER_APP_VERSION=//') - fi - - # Last resort: nix eval for nixpkgs packages + # Fall back to nix eval for nixpkgs packages if [ -z "$VERSION" ]; then VERSION=$(nix --extra-experimental-features "nix-command flakes" \ eval --raw "nixpkgs#${CONTAINER}.version")