don't install jq to build windows, docker (not required anymore) (#1800)
This commit is contained in:
parent
1d9f861f28
commit
f78270188f
3 changed files with 4 additions and 6 deletions
|
@ -13,7 +13,7 @@ RUN SYSTEM="docker" make release
|
||||||
RUN cd crowdsec-v* && ./wizard.sh --docker-mode && cd -
|
RUN cd crowdsec-v* && ./wizard.sh --docker-mode && cd -
|
||||||
RUN cscli hub update && cscli collections install crowdsecurity/linux && cscli parsers install crowdsecurity/whitelists
|
RUN cscli hub update && cscli collections install crowdsecurity/linux && cscli parsers install crowdsecurity/whitelists
|
||||||
FROM alpine:latest
|
FROM alpine:latest
|
||||||
RUN apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community tzdata yq jq bash && \
|
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/etc/crowdsec && \
|
||||||
mkdir -p /staging/var/lib/crowdsec
|
mkdir -p /staging/var/lib/crowdsec
|
||||||
COPY --from=build /etc/crowdsec /staging/etc/crowdsec
|
COPY --from=build /etc/crowdsec /staging/etc/crowdsec
|
||||||
|
|
|
@ -5,7 +5,7 @@ FROM golang:${GOVERSION}-bullseye AS build
|
||||||
WORKDIR /go/src/crowdsec
|
WORKDIR /go/src/crowdsec
|
||||||
|
|
||||||
# wizard.sh requires GNU coreutils
|
# 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 . .
|
COPY . .
|
||||||
|
|
||||||
|
@ -23,7 +23,6 @@ RUN apt-get install -y -q --install-recommends --no-install-suggests \
|
||||||
iproute2 \
|
iproute2 \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
bash \
|
bash \
|
||||||
jq \
|
|
||||||
tzdata && \
|
tzdata && \
|
||||||
mkdir -p /staging/etc/crowdsec && \
|
mkdir -p /staging/etc/crowdsec && \
|
||||||
mkdir -p /staging/var/lib/crowdsec
|
mkdir -p /staging/var/lib/crowdsec
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
#install choco
|
#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'))
|
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 golang
|
||||||
choco install -y jq
|
|
||||||
choco install -y git
|
choco install -y git
|
||||||
choco install -y mingw
|
choco install -y mingw
|
||||||
refreshenv
|
refreshenv
|
||||||
|
|
Loading…
Reference in a new issue