From 500d0aeda01c4cdf6a89ef4ecc236a454faa3036 Mon Sep 17 00:00:00 2001 From: Hidde Beydals Date: Fri, 1 Oct 2021 19:08:59 +0200 Subject: [PATCH] Update base image to version with Darwin detection To provide a better (contributing) experience to those with Apple machines, as determining the correct paths there is a bit harder. Signed-off-by: Hidde Beydals --- .github/actions/run-tests/Dockerfile | 2 +- Dockerfile | 2 +- Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/actions/run-tests/Dockerfile b/.github/actions/run-tests/Dockerfile index 25e4f232..afc7d4b5 100644 --- a/.github/actions/run-tests/Dockerfile +++ b/.github/actions/run-tests/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/fluxcd/golang-with-libgit2:1.16.8-bullseye-libgit2-1.1.1 as build +FROM ghcr.io/fluxcd/golang-with-libgit2:1.16.8-bullseye-libgit2-1.1.1-1 as build # Use the GitHub Actions uid:gid combination for proper fs permissions RUN groupadd -g 116 test && \ diff --git a/Dockerfile b/Dockerfile index a97bac5d..68d65124 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ ARG BASE_IMG=ghcr.io/fluxcd/golang-with-libgit2 -ARG BASE_TAG=1.16.8-bullseye-libgit2-1.1.1 +ARG BASE_TAG=1.16.8-bullseye-libgit2-1.1.1-1 FROM ${BASE_IMG}:${BASE_TAG} AS build # Configure workspace diff --git a/Makefile b/Makefile index 73fcd508..c8769a6f 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ TAG ?= latest # Base image used to build the Go binary BASE_IMG ?= ghcr.io/fluxcd/golang-with-libgit2 -BASE_TAG ?= 1.16.8-bullseye-libgit2-1.1.1 +BASE_TAG ?= 1.16.8-bullseye-libgit2-1.1.1-1 # Allows for defining additional Docker buildx arguments, # e.g. '--push'.