From 4c769e0d33a0e8e04f1a024741b124fa7eed4ea8 Mon Sep 17 00:00:00 2001
From: Willy Kloucek <wkloucek@owncloud.com>
Date: Wed, 24 Mar 2021 13:41:42 +0100
Subject: [PATCH] update alpine base image to 3.14

---
 Dockerfile                         | 11 ++---------
 ocis/docker/Dockerfile.linux.amd64 |  2 +-
 ocis/docker/Dockerfile.linux.arm   |  2 +-
 ocis/docker/Dockerfile.linux.arm64 |  2 +-
 4 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8b277ce0e0..c4a6426a00 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,19 +1,12 @@
-FROM golang:1.16-alpine as build
+FROM owncloudci/golang:1.16 as build
 
 COPY ./ /ocis/
-ENV CGO_ENABLED=0
-ENV GOOS=linux
-
-RUN apk update && \
-	apk upgrade --ignore musl-dev && \
-	apk add make gcc bash && \
-	rm -rf /var/cache/apk/*
 
 WORKDIR /ocis/ocis
 RUN make clean generate build
 
 
-FROM alpine:3
+FROM alpine:3.14
 
 RUN apk update && \
 	apk upgrade && \
diff --git a/ocis/docker/Dockerfile.linux.amd64 b/ocis/docker/Dockerfile.linux.amd64
index a5919002d2..38e9f5822f 100644
--- a/ocis/docker/Dockerfile.linux.amd64
+++ b/ocis/docker/Dockerfile.linux.amd64
@@ -1,4 +1,4 @@
-FROM amd64/alpine:3.12
+FROM amd64/alpine:3.14
 
 ARG VERSION=""
 ARG REVISION=""
diff --git a/ocis/docker/Dockerfile.linux.arm b/ocis/docker/Dockerfile.linux.arm
index 4df910624e..a1fdcd9262 100644
--- a/ocis/docker/Dockerfile.linux.arm
+++ b/ocis/docker/Dockerfile.linux.arm
@@ -1,4 +1,4 @@
-FROM arm32v6/alpine:3.12
+FROM arm32v6/alpine:3.14
 
 ARG VERSION=""
 ARG REVISION=""
diff --git a/ocis/docker/Dockerfile.linux.arm64 b/ocis/docker/Dockerfile.linux.arm64
index 1efa4a0b23..ccb4c62b0e 100644
--- a/ocis/docker/Dockerfile.linux.arm64
+++ b/ocis/docker/Dockerfile.linux.arm64
@@ -1,4 +1,4 @@
-FROM arm64v8/alpine:3.12
+FROM arm64v8/alpine:3.14
 
 ARG VERSION=""
 ARG REVISION=""