Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CI: use golang:alpine3.13 as builder/base to prevent 'make' errors #1844

Merged
merged 1 commit into from
Jun 30, 2021
Merged

CI: use golang:alpine3.13 as builder/base to prevent 'make' errors #1844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile.reva
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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