From aa5b0e4563f42e59c63945aa5beeb2d2c5546a02 Mon Sep 17 00:00:00 2001 From: Samuel Alfageme Date: Wed, 30 Jun 2021 09:11:53 +0200 Subject: [PATCH] CI: use golang:alpine3.13 as builder/base to prevent make errors (#1844) --- Dockerfile.reva | 2 +- Dockerfile.revad | 4 ++-- changelog/unreleased/ci-fix-reva-dockerfile-path.md | 7 ++++++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Dockerfile.reva b/Dockerfile.reva index 9269c2a33e..97ebb664a5 100644 --- a/Dockerfile.reva +++ b/Dockerfile.reva @@ -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 \ diff --git a/Dockerfile.revad b/Dockerfile.revad index 7d6dbc5d3c..0455e04542 100644 --- a/Dockerfile.revad +++ b/Dockerfile.revad @@ -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 \ @@ -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 diff --git a/changelog/unreleased/ci-fix-reva-dockerfile-path.md b/changelog/unreleased/ci-fix-reva-dockerfile-path.md index fb0e9c9caf..2867b8508f 100644 --- a/changelog/unreleased/ci-fix-reva-dockerfile-path.md +++ b/changelog/unreleased/ci-fix-reva-dockerfile-path.md @@ -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