From 794fdc041ee79ad315d58fa39c088de417542ddd Mon Sep 17 00:00:00 2001 From: Yuli Date: Fri, 14 Mar 2025 18:28:49 +0200 Subject: [PATCH] revert some changed --- Dockerfile | 5 +++-- build.sh | 4 +++- src/go.mod | 8 ++++---- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6228f4c..1a0eed5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,8 +4,9 @@ FROM golang:alpine AS builder RUN apk update && apk add --no-cache git gcc libc-dev openssl && go install github.com/gobuffalo/packr/packr@latest WORKDIR /go/src/securitybunker/databunker/src/ -COPY src/go.mod ./deps -RUN cat ./deps | grep -v storage | grep -v utils | grep -v audit > ./go.mod && go mod download +COPY src/go.mod ./go.mod +#RUN cat ./deps | grep -v storage | grep -v utils | grep -v audit > ./go.mod && go mod download +RUN go mod download COPY . /go/src/securitybunker/databunker/ WORKDIR /go/src/securitybunker/databunker/ #RUN echo "tidy " && go get -u && go mod tidy && cat ./go.mod diff --git a/build.sh b/build.sh index 8c25ede..1bc2e62 100755 --- a/build.sh +++ b/build.sh @@ -15,7 +15,9 @@ else fi cd src -go get -v +go get -v -v + +cat go.mod if [ -x ~/go/bin/packr ]; then ~/go/bin/packr diff --git a/src/go.mod b/src/go.mod index 6edf8b8..04e496b 100644 --- a/src/go.mod +++ b/src/go.mod @@ -4,8 +4,8 @@ go 1.22.0 toolchain go1.23.3 -replace github.com/securitybunker/databunker/src/storage => ./storage -replace github.com/securitybunker/databunker/src/utils => ./utils +// replace github.com/securitybunker/databunker/src/storage => ./storage +// replace github.com/securitybunker/databunker/src/utils => ./utils require ( github.com/afocus/captcha v0.0.0-20191010092841-4bd1f21c8868 @@ -17,8 +17,8 @@ require ( github.com/oschwald/geoip2-golang v1.11.0 github.com/prometheus/client_golang v1.20.5 github.com/qri-io/jsonpointer v0.1.1 - github.com/securitybunker/databunker/src/storage v0.0.0 - github.com/securitybunker/databunker/src/utils v0.0.0 +// github.com/securitybunker/databunker/src/storage v0.0.0 +// github.com/securitybunker/databunker/src/utils v0.0.0 github.com/securitybunker/jsonschema v0.2.1-0.20201128224651-d77c1a3cb787 github.com/tidwall/gjson v1.18.0 go.mongodb.org/mongo-driver v1.17.1