setting :: 명령어 실행 순서 변경

team-xquare · Jan 9, 2024 · 1365693 · 1365693
1 parent 79ac1e2
commit 1365693
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -13,12 +13,17 @@ COPY .bingo .bingo
 COPY Makefile main.go ./
 COPY pkg pkg
 
+# Install build dependencies
+RUN if grep -i -q alpine /etc/issue; then \
+      apk add --no-cache gcc g++ make git; \
+    fi
+
+RUN make gen
+
 RUN go mod tidy \
     && go get -u -d -v ./...
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -ldflags '-s -w' -o project
 
-RUN apt update && apt install -y make
-RUN make gen-go
 RUN make build
 
 FROM scratch

diff --git a/go.mod b/go.mod
@@ -14,7 +14,7 @@ require (
 	github.com/grafana/dataplane/sdata v0.0.6
 	github.com/grafana/dskit v0.0.0-20231221015914-de83901bf4d6
 	github.com/grafana/grafana-aws-sdk v0.20.0
-	github.com/grafana/grafana-plugin-sdk-go v0.198.0
+	github.com/grafana/grafana-plugin-sdk-go v0.197.0
 	github.com/grafana/kindsys v0.0.0-20230926104744-988ea4c8a739
 	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
 	github.com/json-iterator/go v1.1.12