This is an automated email from the ASF dual-hosted git repository.
zhangliang2022 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
The following commit(s) were added to refs/heads/main by this push:
new 7aeac3103 fix: remove dlv from docker image / upgrade go-dep in the
Makefile (#5788)
7aeac3103 is described below
commit 7aeac3103f27531f81074db3cf6d3d39bf38fe6b
Author: Klesh Wong <[email protected]>
AuthorDate: Wed Aug 2 11:53:09 2023 +0800
fix: remove dlv from docker image / upgrade go-dep in the Makefile (#5788)
---
backend/Dockerfile | 7 +------
backend/Makefile | 6 +++---
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/backend/Dockerfile b/backend/Dockerfile
index f8532ba24..b0d029ee9 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -49,7 +49,7 @@ RUN if [ "$(arch)" != "x86_64" ] ; then \
apt-get install -y gcc-x86-64-linux-gnu binutils-x86-64-linux-gnu ; \
fi
-RUN go install github.com/vektra/mockery/[email protected]
+RUN go install github.com/vektra/mockery/[email protected]
RUN go install github.com/swaggo/swag/cmd/[email protected]
COPY --from=debian-amd64 /usr/include /rootfs-amd64/usr/include
@@ -89,7 +89,6 @@ ARG TARGETPLATFORM
ARG TAG=
ARG SHA=
ARG GO_PLUGINS=
-ARG DEBUG=
RUN --mount=type=cache,target=/root/.cache/go-build \
if [ "$TARGETPLATFORM" = "linux/arm64" ] ; then \
@@ -105,10 +104,6 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
export CGO_ENABLED=1 &&\
PLUGIN="$GO_PLUGINS" make all
-RUN if [ "$DEBUG" = "true" ]; then \
- go install github.com/go-delve/delve/cmd/dlv@latest; \
- fi;
-
# remove symlink in lib, we will recreate in final image
RUN cd /usr/local/deps/target/lib && \
for file in *.so* ; do \
diff --git a/backend/Makefile b/backend/Makefile
index a0a6780d8..b7fb4569b 100644
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -24,10 +24,10 @@ VERSION = $(TAG)@$(SHA)
PYTHON_DIR ?= "./python"
go-dep:
- go install github.com/vektra/mockery/v2@latest
- go install github.com/swaggo/swag/cmd/[email protected]
+ go install github.com/vektra/mockery/[email protected]
+ go install github.com/swaggo/swag/cmd/[email protected]
+ go install github.com/golangci/golangci-lint/cmd/[email protected]
go install github.com/atombender/go-jsonschema/cmd/gojsonschema@latest
- go install github.com/golangci/golangci-lint/cmd/[email protected]
python-dep:
pip install -r python/requirements.txt
