docker: install gcc before yq (fix i386 build) (#1965)
This commit is contained in:
parent
ff6ade73ce
commit
8d0af73a4f
|
@ -4,8 +4,6 @@ ARG GOVERSION=1.19
|
||||||
|
|
||||||
FROM golang:${GOVERSION}-alpine AS build
|
FROM golang:${GOVERSION}-alpine AS build
|
||||||
|
|
||||||
RUN go install github.com/mikefarah/yq/v4@v4.30.6
|
|
||||||
|
|
||||||
WORKDIR /go/src/crowdsec
|
WORKDIR /go/src/crowdsec
|
||||||
|
|
||||||
COPY . .
|
COPY . .
|
||||||
|
@ -19,7 +17,8 @@ RUN apk add --no-cache git gcc libc-dev make bash gettext binutils-gold coreutil
|
||||||
cd - >/dev/null && \
|
cd - >/dev/null && \
|
||||||
cscli hub update && \
|
cscli hub update && \
|
||||||
cscli collections install crowdsecurity/linux && \
|
cscli collections install crowdsecurity/linux && \
|
||||||
cscli parsers install crowdsecurity/whitelists
|
cscli parsers install crowdsecurity/whitelists && \
|
||||||
|
go install github.com/mikefarah/yq/v4@v4.30.6
|
||||||
|
|
||||||
FROM alpine:latest as build-slim
|
FROM alpine:latest as build-slim
|
||||||
|
|
||||||
|
|
|
@ -4,8 +4,6 @@ ARG GOVERSION=1.19
|
||||||
|
|
||||||
FROM golang:${GOVERSION}-bullseye AS build
|
FROM golang:${GOVERSION}-bullseye AS build
|
||||||
|
|
||||||
RUN go install github.com/mikefarah/yq/v4@v4.30.6
|
|
||||||
|
|
||||||
WORKDIR /go/src/crowdsec
|
WORKDIR /go/src/crowdsec
|
||||||
|
|
||||||
COPY . .
|
COPY . .
|
||||||
|
@ -23,7 +21,8 @@ RUN apt-get update && \
|
||||||
cd - >/dev/null && \
|
cd - >/dev/null && \
|
||||||
cscli hub update && \
|
cscli hub update && \
|
||||||
cscli collections install crowdsecurity/linux && \
|
cscli collections install crowdsecurity/linux && \
|
||||||
cscli parsers install crowdsecurity/whitelists
|
cscli parsers install crowdsecurity/whitelists && \
|
||||||
|
go install github.com/mikefarah/yq/v4@v4.30.6
|
||||||
|
|
||||||
FROM debian:bullseye-slim as build-slim
|
FROM debian:bullseye-slim as build-slim
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue