docker: install gcc before yq (fix i386 build) (#1965)

crowdsecurity · Jan 3, 2023 · 8d0af73 · 8d0af73
1 parent ff6ade7
commit 8d0af73
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -4,8 +4,6 @@ ARG GOVERSION=1.19
 
 FROM golang:${GOVERSION}-alpine AS build
 
-RUN go install github.com/mikefarah/yq/[email protected]
-
 WORKDIR /go/src/crowdsec
 
 COPY . .
@@ -19,7 +17,8 @@ RUN apk add --no-cache git gcc libc-dev make bash gettext binutils-gold coreutil
     cd - >/dev/null && \
     cscli hub update && \
     cscli collections install crowdsecurity/linux && \
-    cscli parsers install crowdsecurity/whitelists
+    cscli parsers install crowdsecurity/whitelists && \
+    go install github.com/mikefarah/yq/[email protected]
 
 FROM alpine:latest as build-slim
 

diff --git a/Dockerfile.debian b/Dockerfile.debian
@@ -4,8 +4,6 @@ ARG GOVERSION=1.19
 
 FROM golang:${GOVERSION}-bullseye AS build
 
-RUN go install github.com/mikefarah/yq/[email protected]
-
 WORKDIR /go/src/crowdsec
 
 COPY . .
@@ -23,7 +21,8 @@ RUN apt-get update && \
     cd - >/dev/null && \
     cscli hub update && \
     cscli collections install crowdsecurity/linux && \
-    cscli parsers install crowdsecurity/whitelists
+    cscli parsers install crowdsecurity/whitelists && \
+    go install github.com/mikefarah/yq/[email protected]
 
 FROM debian:bullseye-slim as build-slim