Merge pull request 'Update base dependencies' (#3) from renovate/base-dependencies into main
Some checks failed
continuous-integration/drone/push Build is failing
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #3
This commit is contained in:
commit
1a4c113876
1 changed files with 2 additions and 2 deletions
|
@ -11,7 +11,7 @@ ENV FILTRON_VERSION="v0.2.0"
|
||||||
WORKDIR $GOPATH/src/github.com/asciimoo/filtron
|
WORKDIR $GOPATH/src/github.com/asciimoo/filtron
|
||||||
|
|
||||||
RUN apk upgrade --no-cache && \
|
RUN apk upgrade --no-cache && \
|
||||||
apk add --no-cache tar="1.32-r1" git="2.26.2-r0" curl="7.69.1-r3" && \
|
apk add --no-cache tar="1.33-r1" git="2.30.0-r0" curl="7.74.0-r0" && \
|
||||||
curl -L "https://github.com/asciimoo/filtron/archive/${FILTRON_VERSION}.tar.gz" | tar xvz --strip 1
|
curl -L "https://github.com/asciimoo/filtron/archive/${FILTRON_VERSION}.tar.gz" | tar xvz --strip 1
|
||||||
|
|
||||||
RUN go get -d -v && gofmt -l ./ && go build .
|
RUN go get -d -v && gofmt -l ./ && go build .
|
||||||
|
@ -22,7 +22,7 @@ FROM arm32v7/alpine:3.13.1@sha256:817f5bc4194eccd71ad9afe9c2eb7e73a5841180a88a38
|
||||||
FROM arm64v8/alpine:3.13.1@sha256:019c59128325536e838a5f36028db214335129f9aa83214cc2c60c10dc1797ac AS base-arm64
|
FROM arm64v8/alpine:3.13.1@sha256:019c59128325536e838a5f36028db214335129f9aa83214cc2c60c10dc1797ac AS base-arm64
|
||||||
FROM base-${ARCH}
|
FROM base-${ARCH}
|
||||||
|
|
||||||
RUN apk --no-cache add ca-certificates="20191127-r4" && \
|
RUN apk --no-cache add ca-certificates="20191127-r5" && \
|
||||||
adduser -D -h /usr/local/filtron -s /bin/false filtron filtron
|
adduser -D -h /usr/local/filtron -s /bin/false filtron filtron
|
||||||
|
|
||||||
COPY --from=builder /go/src/github.com/asciimoo/filtron/example_rules.json /etc/filtron/rules.json
|
COPY --from=builder /go/src/github.com/asciimoo/filtron/example_rules.json /etc/filtron/rules.json
|
||||||
|
|
Reference in a new issue