From f78270188f75c1fff1b7b8e8d62c83a23d5342a0 Mon Sep 17 00:00:00 2001 From: mmetc <92726601+mmetc@users.noreply.github.com> Date: Tue, 11 Oct 2022 13:32:23 +0200 Subject: [PATCH] don't install jq to build windows, docker (not required anymore) (#1800) --- Dockerfile | 6 +++--- Dockerfile.debian | 3 +-- windows/install_dev_windows.ps1 | 1 - 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 900529a42..7a28ed73e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,9 +13,9 @@ RUN SYSTEM="docker" make release RUN cd crowdsec-v* && ./wizard.sh --docker-mode && cd - RUN cscli hub update && cscli collections install crowdsecurity/linux && cscli parsers install crowdsecurity/whitelists FROM alpine:latest -RUN apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community tzdata yq jq bash && \ - mkdir -p /staging/etc/crowdsec && \ - mkdir -p /staging/var/lib/crowdsec +RUN apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community tzdata yq bash && \ + mkdir -p /staging/etc/crowdsec && \ + mkdir -p /staging/var/lib/crowdsec COPY --from=build /etc/crowdsec /staging/etc/crowdsec COPY --from=build /var/lib/crowdsec /staging/var/lib/crowdsec COPY --from=build /usr/local/bin/crowdsec /usr/local/bin/crowdsec diff --git a/Dockerfile.debian b/Dockerfile.debian index cd962c914..0f1c2ace8 100644 --- a/Dockerfile.debian +++ b/Dockerfile.debian @@ -5,7 +5,7 @@ FROM golang:${GOVERSION}-bullseye AS build WORKDIR /go/src/crowdsec # wizard.sh requires GNU coreutils -RUN apt-get update && apt-get install -y git jq gcc libc-dev make bash gettext binutils-gold coreutils tzdata python3 python3-pip +RUN apt-get update && apt-get install -y git gcc libc-dev make bash gettext binutils-gold coreutils tzdata python3 python3-pip COPY . . @@ -23,7 +23,6 @@ RUN apt-get install -y -q --install-recommends --no-install-suggests \ iproute2 \ ca-certificates \ bash \ - jq \ tzdata && \ mkdir -p /staging/etc/crowdsec && \ mkdir -p /staging/var/lib/crowdsec diff --git a/windows/install_dev_windows.ps1 b/windows/install_dev_windows.ps1 index d3eaad57d..325d8b106 100644 --- a/windows/install_dev_windows.ps1 +++ b/windows/install_dev_windows.ps1 @@ -1,7 +1,6 @@ #install choco Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1')) choco install -y golang -choco install -y jq choco install -y git choco install -y mingw refreshenv