From b283e3e9c5f120479c517890fb22abc0cbe4fad7 Mon Sep 17 00:00:00 2001
From: Hidde Beydals <hello@hidde.co>
Date: Thu, 30 Sep 2021 16:24:32 +0200
Subject: [PATCH] Change image to image under Flux organization

Signed-off-by: Hidde Beydals <hello@hidde.co>
---
 .github/actions/run-tests/Dockerfile | 2 +-
 Dockerfile                           | 4 ++--
 Makefile                             | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/actions/run-tests/Dockerfile b/.github/actions/run-tests/Dockerfile
index f07783ac..25e4f232 100644
--- a/.github/actions/run-tests/Dockerfile
+++ b/.github/actions/run-tests/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/hiddeco/golang-with-libgit2:dev as build
+FROM ghcr.io/fluxcd/golang-with-libgit2:1.16.8-bullseye-libgit2-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 08661246..a97bac5d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
-ARG BASE_IMG=ghcr.io/hiddeco/golang-with-libgit2
-ARG BASE_TAG=dev
+ARG BASE_IMG=ghcr.io/fluxcd/golang-with-libgit2
+ARG BASE_TAG=1.16.8-bullseye-libgit2-1.1.1
 FROM ${BASE_IMG}:${BASE_TAG} AS build
 
 # Configure workspace
diff --git a/Makefile b/Makefile
index a1a6ee9c..73fcd508 100644
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,8 @@ IMG ?= fluxcd/source-controller
 TAG ?= latest
 
 # Base image used to build the Go binary
-BASE_IMG ?= ghcr.io/hiddeco/golang-with-libgit2
-BASE_TAG ?= dev
+BASE_IMG ?= ghcr.io/fluxcd/golang-with-libgit2
+BASE_TAG ?= 1.16.8-bullseye-libgit2-1.1.1
 
 # Allows for defining additional Docker buildx arguments,
 # e.g. '--push'.