From 7a286751265cbbafd00fb58dfc21264e2c7c4fea Mon Sep 17 00:00:00 2001
From: Pavel Tumik <18602811+sagor999@users.noreply.github.com>
Date: Wed, 2 Mar 2022 23:57:31 +0000
Subject: [PATCH 1/2] add docker image for gpctl and kubecdl

---
 dev/BUILD.yaml         | 19 ++++++++++++++++++-
 dev/gpctl/BUILD.yaml   |  1 -
 dev/kubecdl/BUILD.yaml |  1 -
 dev/leeway.Dockerfile  |  7 +++++++
 4 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 dev/leeway.Dockerfile

diff --git a/dev/BUILD.yaml b/dev/BUILD.yaml
index ad68f3a636d962..a2d7de92d8de4d 100644
--- a/dev/BUILD.yaml
+++ b/dev/BUILD.yaml
@@ -5,6 +5,7 @@ packages:
       - dev/image:docker
       - dev/poolkeeper:docker
       - dev/sweeper:docker
+      - :dev-utils
     config:
       commands:
         - ["sh", "-c", "tail -n1 dev-sweeper--docker/imgnames.txt > sweeper.txt"]
@@ -13,4 +14,20 @@ packages:
     deps:
       - dev/blowtorch:app
       - dev/gpctl:app
-      - dev/loadgen:app
\ No newline at end of file
+      - dev/loadgen:app
+  - name: dev-utils
+    type: docker
+    deps:
+      - dev/gpctl:app
+      - dev/kubecdl:app
+    argdeps:
+      - imageRepoBase
+    config:
+      buildArgs:
+        VERSION: ${version}
+      dockerfile: leeway.Dockerfile
+      metadata:
+        helm-component: dev-utils
+      image:
+        - ${imageRepoBase}/dev-utils:${version}
+        - ${imageRepoBase}/dev-utils:commit-${__git_commit}
diff --git a/dev/gpctl/BUILD.yaml b/dev/gpctl/BUILD.yaml
index 8e72e8b0c2e61f..5e3bea99407af5 100644
--- a/dev/gpctl/BUILD.yaml
+++ b/dev/gpctl/BUILD.yaml
@@ -18,4 +18,3 @@ packages:
     config:
       packaging: app
       dontTest: true
-
diff --git a/dev/kubecdl/BUILD.yaml b/dev/kubecdl/BUILD.yaml
index 3aa65542af6507..8eb9ee1bd0d9a0 100644
--- a/dev/kubecdl/BUILD.yaml
+++ b/dev/kubecdl/BUILD.yaml
@@ -10,4 +10,3 @@ packages:
     config:
       packaging: app
       dontTest: true
-
diff --git a/dev/leeway.Dockerfile b/dev/leeway.Dockerfile
new file mode 100644
index 00000000000000..880ae9cea86066
--- /dev/null
+++ b/dev/leeway.Dockerfile
@@ -0,0 +1,7 @@
+# Copyright (c) 2022 Gitpod GmbH. All rights reserved.
+# Licensed under the GNU Affero General Public License (AGPL).
+# See License-AGPL.txt in the project root for license information.
+
+FROM scratch
+
+COPY dev-gpctl--app/gpctl dev-kubecdl--app/kubecdl /app/

From 8c1179241ba24525bf17f4e1ca8c367eacb8b36b Mon Sep 17 00:00:00 2001
From: Pavel Tumik <18602811+sagor999@users.noreply.github.com>
Date: Fri, 4 Mar 2022 15:36:30 +0000
Subject: [PATCH 2/2] remove helm-component as it is not needed for dev-utils
 image

---
 dev/BUILD.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/dev/BUILD.yaml b/dev/BUILD.yaml
index a2d7de92d8de4d..3cd43e28a168ba 100644
--- a/dev/BUILD.yaml
+++ b/dev/BUILD.yaml
@@ -26,8 +26,6 @@ packages:
       buildArgs:
         VERSION: ${version}
       dockerfile: leeway.Dockerfile
-      metadata:
-        helm-component: dev-utils
       image:
         - ${imageRepoBase}/dev-utils:${version}
         - ${imageRepoBase}/dev-utils:commit-${__git_commit}