Skip to content

Commit

Permalink
CI: use golang:alpine3.13 as builder/base to prevent make errors (cs3…
Browse files Browse the repository at this point in the history
  • Loading branch information
SamuAlfageme authored and tmourati committed Jul 12, 2021
1 parent a7db564 commit b1b0eeb
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Dockerfile.reva
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# granted to it by virtue of its status as an Intergovernmental Organization
# or submit itself to any jurisdiction.

FROM golang:alpine as builder
FROM golang:alpine3.13 as builder

RUN apk --no-cache add \
ca-certificates \
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.revad
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# granted to it by virtue of its status as an Intergovernmental Organization
# or submit itself to any jurisdiction.

FROM golang:alpine as builder
FROM golang:alpine3.13 as builder

RUN apk --no-cache add \
ca-certificates \
Expand All @@ -36,7 +36,7 @@ RUN make build-revad-docker && \

RUN mkdir -p /etc/revad/ && echo "" > /etc/revad/revad.toml

FROM golang:alpine
FROM golang:alpine3.13

RUN apk --no-cache add \
mailcap
Expand Down
7 changes: 6 additions & 1 deletion changelog/unreleased/ci-fix-reva-dockerfile-path.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
Bugfix: use the right Dockerfile path for the reva CLI
Bugfix: correct Dockerfile path for the reva CLI and alpine3.13 as builder

This was introduced on https://github.com/cs3org/reva/commit/117adad while
porting the configuration on .drone.yml to starlark.

Force golang:alpine3.13 as base image to prevent errors from Make when
running on Docker <20.10 as it happens on Drone
ref.https://gitlab.alpinelinux.org/alpine/aports/-/issues/12396

https://github.com/cs3org/reva/pull/1843
https://github.com/cs3org/reva/pull/1844

0 comments on commit b1b0eeb

Please sign in to comment.