Working.

Author: elliotcourant

.gitlab-ci.yml

@@ -1,15 +1,15 @@
 FROM ubuntu:20.04
-
-ARG FROMPLACE=kaniko:local
-
-# Add .docker config dir
 RUN mkdir -p /kaniko/.docker
-COPY --from=$FROMPLACE /kaniko/executor /usr/local/bin/kaniko
-COPY kaniko/files/nsswitch.conf /etc/nsswitch.conf
+# From 2 will grab the files we need from the kaniko image. This only works when this dockerfile has been appended to
+# the actual debug dockerfile in the kaniko repo.
+COPY --from=2 /kaniko/executor /usr/local/bin/kaniko
+COPY files/nsswitch.conf /etc/nsswitch.conf
 ENV HOME /root
 ENV USER root
 ENV PATH /usr/local/bin:/bin:$PATH
 ENV DOCKER_CONFIG /kaniko/.docker/
+
+# Now that we have all the kaniko files we need, install the additional tools we want to use.
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get install -y \
     curl \

Dockerfile

@@ -2,11 +2,7 @@
 build-debug:
 	docker buildx rm "build-$$(git rev-parse --short HEAD)" || true
 	docker buildx create --platform linux/amd64 --use --name "build-$$(git rev-parse --short HEAD)"
-#	docker buildx build --platform linux/amd64 \
-#		-o type=docker \
-#		-f kaniko/deploy/Dockerfile_debug \
-#		-t containers.harderthanitneedstobe.com/kaniko ./kaniko
-	docker buildx build --platform linux/amd64 \
-		-f Dockerfile \
-		--push \
-		-t containers.harderthanitneedstobe.com/kaniko-test .
+	printf "$$(cat kaniko/deploy/Dockerfile_debug)\n\n$$(cat Dockerfile)" | docker buildx build --platform linux/amd64 \
+		-f - \
+		-t containers.harderthanitneedstobe.com/kaniko:$$(git rev-parse --short HEAD) ./kaniko \
+		--push

Makefile

@@ -1,3 +1,9 @@
 # kaniko-ci
 
-Using kaniko to build kaniko.
+This is a build container that takes Kaniko and lifts it into a more useful image (ubuntu) so that other tools can be
+used alongside it (git, make, etc). This is technically not supported by kaniko, but so far it works and makes building
+pipelines much easier.
+
+We use the actual Kaniko repo as a submodule, and we build the container by appending our `Dockerfile` onto the end of
+their `Dockerfile_debug`. This way we are still staying true to how kaniko is meant to be built; but we can add our own
+tools in at the end as well as push our container to our own registry.