From 1f1e13a34c7a07083be1474eb7ec4424cbdcb68e Mon Sep 17 00:00:00 2001
From: echeng-BC <104777405+echeng-BC@users.noreply.github.com>
Date: Wed, 28 Jun 2023 11:59:59 -0400
Subject: [PATCH 1/2] Update Dockerfile

Docker v20.10 introduced the first stable version of Builtkit.
Buildkit is the default builder starting in v23.0.

To enable Buildkit on previous versions, the environment variable of `DOCKER_BUILDKIT=1` needs to be set.
---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index 9508772..2fa969c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,6 +6,7 @@ ARG GOSU_VERSION=1.11
 ARG DOCKER_CHANNEL=stable
 ARG DOCKER_VERSION=20.10.10
 ARG TINY_VERSION=0.18.0
+ARG DOCKER_BUILDKIT=1
 
 USER root
 

From 585aeef5dbb367f1fe759f13d0b347803d9203c6 Mon Sep 17 00:00:00 2001
From: echeng-BC <104777405+echeng-BC@users.noreply.github.com>
Date: Wed, 28 Jun 2023 12:10:00 -0400
Subject: [PATCH 2/2] Update Dockerfile

Upgrading to newer docker version that includes build kit by default instead of trying to enable it on older version.
---
 Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2fa969c..9615432 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,9 +4,8 @@ FROM jenkins/inbound-agent:${FROM_TAG}
 
 ARG GOSU_VERSION=1.11
 ARG DOCKER_CHANNEL=stable
-ARG DOCKER_VERSION=20.10.10
+ARG DOCKER_VERSION=24.0.2
 ARG TINY_VERSION=0.18.0
-ARG DOCKER_BUILDKIT=1
 
 USER root