From 48dbf6f3cf7a124f5975a15ea3a7e6ae663682fc Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn <github@gone.nl> Date: Thu, 22 Jul 2021 14:48:09 +0200 Subject: [PATCH] Update Dockerfiles to latest syntax, remove "experimental" The experimental image is deprecated (now "labs"), and the features we use are now included in the regular (stable) syntax. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> --- Dockerfile | 2 +- dockerfiles/Dockerfile.dev | 3 ++- dockerfiles/Dockerfile.lint | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3c15b560fe7e..1027df05c216 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -#syntax=docker/dockerfile:1.2 +# syntax=docker/dockerfile:1.3 ARG BASE_VARIANT=alpine ARG GO_VERSION=1.13.15 diff --git a/dockerfiles/Dockerfile.dev b/dockerfiles/Dockerfile.dev index ddd1b6b72be2..a82eb728367d 100644 --- a/dockerfiles/Dockerfile.dev +++ b/dockerfiles/Dockerfile.dev @@ -1,4 +1,5 @@ -# syntax=docker/dockerfile:1.1.7-experimental +# syntax=docker/dockerfile:1.3 + ARG GO_VERSION=1.13.15 FROM golang:${GO_VERSION}-alpine AS golang diff --git a/dockerfiles/Dockerfile.lint b/dockerfiles/Dockerfile.lint index 7b180f51e364..8c4923c1a383 100644 --- a/dockerfiles/Dockerfile.lint +++ b/dockerfiles/Dockerfile.lint @@ -1,4 +1,4 @@ -# syntax=docker/dockerfile:1.1.3-experimental +# syntax=docker/dockerfile:1.3 ARG GO_VERSION=1.13.15 ARG GOLANGCI_LINTER_SHA="v1.21.0"