Skip to content

Commit

Permalink
Merge pull request #668 from mendersoftware/cherry-4.0.x-dependabot/d…
Browse files Browse the repository at this point in the history
…ocker/alpine-3.15.0

[Cherry 4.0.x]: Changelog:All: Bump alpine from 3.14.2 to 3.15.0.
  • Loading branch information
mzedel committed Jan 19, 2022
2 parents 5e8234a + 8a665c4 commit bee605b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ WORKDIR /go/src/github.com/mendersoftware/deployments
COPY ./ .
RUN env CGO_ENABLED=1 go build

FROM alpine:3.14.2
FROM alpine:3.15.0
RUN apk add --no-cache ca-certificates xz
RUN mkdir -p /etc/deployments
EXPOSE 8080
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.acceptance-testing
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ WORKDIR /go/src/github.com/mendersoftware/deployments
COPY ./ .
RUN env CGO_ENABLED=0 go test -c -o deployments-test -coverpkg $(go list ./... | grep -v vendor | grep -v mock | grep -v test | tr '\n' ,)

FROM alpine:3.14.2
FROM alpine:3.15.0
RUN apk add --no-cache ca-certificates xz-dev
RUN mkdir /etc/deployments
EXPOSE 8080
Expand Down

0 comments on commit bee605b

Please sign in to comment.