diff --git a/Dockerfile b/Dockerfile index b036cbc9..8427822d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -78,14 +78,19 @@ ENV SETUPTOOLS_SCM_PRETEND_VERSION_FOR_BREWMAN=$SETUPTOOLS_SCM_PRETEND_VERSION_F RUN --mount=type=cache,target=/root/.cache/uv \ --mount=type=bind,source=brewman/uv.lock,target=uv.lock \ --mount=type=bind,source=brewman/pyproject.toml,target=pyproject.toml \ + --mount=source=.git,target=.git,type=bind \ uv sync --locked --no-install-project COPY /brewman ./ COPY --from=builder /frontend/browser /app/frontend +RUN ls -lah # Sync the project # Ref: https://docs.astral.sh/uv/guides/integration/docker/#intermediate-layers RUN --mount=type=cache,target=/root/.cache/uv \ + --mount=type=bind,source=brewman/uv.lock,target=uv.lock \ + --mount=type=bind,source=brewman/pyproject.toml,target=pyproject.toml \ + --mount=source=.git,target=.git,type=bind \ uv sync --locked --no-editable EXPOSE 80 diff --git a/Makefile b/Makefile index 322ae64f..70e35379 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ build-production: ## Build the production container image. Usage: make build-pro --manifest registry.tanshu.com/brewman:latest \ --pull \ --build-arg SETUPTOOLS_SCM_PRETEND_VERSION_FOR_BREWMAN=$(TAG) \ - git@git.tanshu.com:tanshu/brewman.git#v$(TAG) + https://git.tanshu.com/tanshu/brewman.git#v$(TAG) @echo "Pushing manifests..." @podman manifest push --all registry.tanshu.com/brewman:latest docker://registry.tanshu.com/brewman:latest @@ -22,4 +22,4 @@ build-check: ## Multi-arch build without push (compile check). Usage: make build --manifest brewman:test \ --pull \ --build-arg SETUPTOOLS_SCM_PRETEND_VERSION_FOR_BREWMAN=$(TAG) \ - git@git.tanshu.com:tanshu/brewman.git#v$(TAG) + https://git.tanshu.com/tanshu/brewman.git#v$(TAG)