This is an automated email from the ASF dual-hosted git repository.
klesh pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/devlake.git
The following commit(s) were added to refs/heads/main by this push:
new eaf86ce57 build: pin swag CLI and oauth2-proxy, ignore build artifacts
in docker context (#8989)
eaf86ce57 is described below
commit eaf86ce57c38eb90f6c00ee5ccc086bf62da1dfb
Author: Dirk <[email protected]>
AuthorDate: Wed Jul 15 11:06:59 2026 +0200
build: pin swag CLI and oauth2-proxy, ignore build artifacts in docker
context (#8989)
Make the backend container build inputs reproducible and shrink the
Docker build context:
- Align the swag CLI pin to v1.16.6 across backend/Makefile,
backend/Dockerfile and backend/Dockerfile.local so local, CI and
image builds generate Swagger docs with the same tool version.
- Pin the oauth2-proxy dev auth proxy image to v7.15.3-amd64 in both
docker-compose-dev-mysql.yml and docker-compose-dev-postgresql.yml.
- Add backend/.dockerignore to keep regenerated build artifacts
(bin/, mocks/, logs/, Python venv/build output, coverage files and
OS junk) out of the build context. Source under python/ is retained.
No functional/runtime code changes.
Signed-off-by: DoDiODev <[email protected]>
---
backend/.dockerignore | 24 ++++++++++++++++++++++++
backend/Dockerfile | 2 +-
backend/Dockerfile.local | 2 +-
backend/Makefile | 2 +-
docker-compose-dev-mysql.yml | 2 +-
docker-compose-dev-postgresql.yml | 2 +-
6 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/backend/.dockerignore b/backend/.dockerignore
new file mode 100644
index 000000000..36ee77aae
--- /dev/null
+++ b/backend/.dockerignore
@@ -0,0 +1,24 @@
+# Build artifacts: regenerated inside the image (GOBIN=/app/bin + make
build-plugin/build-server).
+# Shipping the host's pre-built bin/ (multiple GB of plugin .so files) bloats
the
+# build context and the builder layer, which can exhaust the Docker VM and
crash BuildKit.
+bin/
+
+# Generated mocks (regenerated via make mock inside the image)
+mocks/
+
+# Runtime logs
+logs/
+
+# Python build/venv artifacts (regenerated; Dockerfile.server reinstalls from
+# requirements.txt / pyproject and runs python/build.sh). Source under python/
is kept.
+**/.venv/
+**/__pycache__/
+**/*.pyc
+python/.devlake-python-build-root/
+
+# Test / coverage output
+*.out
+coverage.txt
+
+# OS / editor junk
+.DS_Store
diff --git a/backend/Dockerfile b/backend/Dockerfile
index 4246ae5f9..1d839f72e 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -50,7 +50,7 @@ RUN if [ "$(arch)" != "x86_64" ] ; then \
fi
RUN go install github.com/vektra/mockery/[email protected]
-RUN go install github.com/swaggo/swag/cmd/[email protected]
+RUN go install github.com/swaggo/swag/cmd/[email protected]
COPY --from=debian-amd64 /usr/include /rootfs-amd64/usr/include
COPY --from=debian-amd64 /usr/lib/x86_64-linux-gnu
/rootfs-amd64/usr/lib/x86_64-linux-gnu
diff --git a/backend/Dockerfile.local b/backend/Dockerfile.local
index ee306dd7e..2fadbcec9 100644
--- a/backend/Dockerfile.local
+++ b/backend/Dockerfile.local
@@ -48,7 +48,7 @@ RUN mkdir -p /tmp/build && cd /tmp/build && \
ldconfig
RUN go install github.com/vektra/mockery/[email protected]
-RUN go install github.com/swaggo/swag/cmd/[email protected]
+RUN go install github.com/swaggo/swag/cmd/[email protected]
WORKDIR /app
COPY . /app
diff --git a/backend/Makefile b/backend/Makefile
index 369e1490f..7aca0a2e4 100644
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -28,7 +28,7 @@ all: build
go-dep:
go install github.com/vektra/mockery/[email protected]
- go install github.com/swaggo/swag/cmd/[email protected]
+ go install github.com/swaggo/swag/cmd/[email protected]
go install
github.com/golangci/golangci-lint/v2/cmd/[email protected]
go-dev-tools:
diff --git a/docker-compose-dev-mysql.yml b/docker-compose-dev-mysql.yml
index 52561e442..11b9bab0b 100644
--- a/docker-compose-dev-mysql.yml
+++ b/docker-compose-dev-mysql.yml
@@ -97,7 +97,7 @@ services:
- devlake
authproxy:
- image: quay.io/oauth2-proxy/oauth2-proxy:v7.4.0-amd64
+ image: quay.io/oauth2-proxy/oauth2-proxy:v7.15.3-amd64
network_mode: "host"
ports:
- 4181:4180
diff --git a/docker-compose-dev-postgresql.yml
b/docker-compose-dev-postgresql.yml
index b718cf5d3..36b0a34e6 100644
--- a/docker-compose-dev-postgresql.yml
+++ b/docker-compose-dev-postgresql.yml
@@ -93,7 +93,7 @@ services:
- devlake
authproxy:
- image: quay.io/oauth2-proxy/oauth2-proxy:v7.4.0-amd64
+ image: quay.io/oauth2-proxy/oauth2-proxy:v7.15.3-amd64
network_mode: "host"
ports:
- 4180:4180
