diff --git a/.circleci/config.yml b/.circleci/config.yml index ec55d13..b927513 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,7 +14,6 @@ jobs: - run: name: install dependencies command: | - cd generator curl -LsSf https://astral.sh/uv/install.sh | sh uv sync --frozen --compile-bytecode echo ". ~/repo/.venv/bin/activate" >> $BASH_ENV @@ -53,8 +52,7 @@ jobs: - run: name: build docker image command: | - cd generator - docker buildx build --progress plain --push --platform ${BUILD_PLATFORMS} --tag bitcart/docker-compose-generator:latest \ + docker buildx build -f generator/Dockerfile --progress plain --push --platform ${BUILD_PLATFORMS} --tag bitcart/docker-compose-generator:latest \ --tag ghcr.io/bitcart/docker-compose-generator:latest . workflows: diff --git a/.coveragerc b/.coveragerc deleted file mode 100644 index e89167b..0000000 --- a/.coveragerc +++ /dev/null @@ -1,8 +0,0 @@ -[run] -source = . -omit = - *__main__.py, - generator/tests/**, - venv/**, - env/**, - *__init__.py diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 890fa2e..69ff6fd 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -4,7 +4,7 @@ repos: hooks: - id: check-merge-conflict - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.8.3 + rev: v0.8.4 hooks: - id: ruff - id: ruff-format diff --git a/build.sh b/build.sh index 70ab9b6..7b91545 100755 --- a/build.sh +++ b/build.sh @@ -3,7 +3,7 @@ set -e : "${BITCARTGEN_DOCKER_IMAGE:=bitcart/docker-compose-generator}" if [ "$BITCARTGEN_DOCKER_IMAGE" == "bitcart/docker-compose-generator:local" ]; then - docker build generator --tag $BITCARTGEN_DOCKER_IMAGE + docker build -f generator/Dockerfile . --tag $BITCARTGEN_DOCKER_IMAGE else set +e docker pull $BITCARTGEN_DOCKER_IMAGE diff --git a/generator/Dockerfile b/generator/Dockerfile index d644228..ae99a63 100644 --- a/generator/Dockerfile +++ b/generator/Dockerfile @@ -1,10 +1,12 @@ FROM python:3.11-alpine COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/ LABEL org.bitcart.image=docker-compose-generator -COPY . /app/generator WORKDIR /app +COPY pyproject.toml uv.lock /app/ +COPY generator /app/generator ENV UV_COMPILE_BYTECODE=1 ENV UV_NO_CACHE=1 ENV UV_NO_SYNC=1 RUN uv sync --frozen --no-dev +ENV PATH="/app/.venv/bin:$PATH" ENTRYPOINT [ "python3", "-m", "generator"] diff --git a/pyproject.toml b/pyproject.toml index 642bdd3..b1a1eb3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,2 +1,12 @@ [tool.uv.workspace] members = ["generator"] + +[tool.coverage.run] +source = ["."] +omit = [ + "*__main__.py", + "generator/tests/**", + "venv/**", + "env/**", + "*__init__.py", +]