IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

CI: Fix missing vendor dependencies (#91872)

Browse Source 
* Add missing dependency to Dockerfile

Add aggregator dependency to Dockerfile, fix the issue #91871.

* Add defaults.ini to Dockerfile, add bash for alpine
This commit is contained in:
Mehrshad Lotfi 2024-08-15 15:02:15 +02:00 committed by GitHub
parent 42efb14989
commit 868f9320e9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile
View File

@ -20,6 +20,7 @@ COPY packages packages
COPY plugins-bundled plugins-bundled COPY plugins-bundled plugins-bundled
COPY public public COPY public public
COPY LICENSE ./ COPY LICENSE ./
COPY conf/defaults.ini ./conf/defaults.ini
RUN apk add --no-cache make build-base python3 RUN apk add --no-cache make build-base python3
@ -44,6 +45,7 @@ RUN if grep -i -q alpine /etc/issue; then \
apk add --no-cache \ apk add --no-cache \
# This is required to allow building on arm64 due to https://github.com/golang/go/issues/22040 # This is required to allow building on arm64 due to https://github.com/golang/go/issues/22040
binutils-gold \ binutils-gold \
bash \
# Install build dependencies # Install build dependencies
gcc g++ make git; \ gcc g++ make git; \
fi fi
@ -62,6 +64,7 @@ COPY pkg/build/wire/go.* pkg/build/wire/
COPY pkg/promlib/go.* pkg/promlib/ COPY pkg/promlib/go.* pkg/promlib/
COPY pkg/storage/unified/resource/go.* pkg/storage/unified/resource/ COPY pkg/storage/unified/resource/go.* pkg/storage/unified/resource/
COPY pkg/semconv/go.* pkg/semconv/ COPY pkg/semconv/go.* pkg/semconv/
COPY pkg/aggregator/go.* pkg/aggregator/
RUN go mod download RUN go mod download
RUN if [[ "$BINGO" = "true" ]]; then \ RUN if [[ "$BINGO" = "true" ]]; then \