From 6e72c3d1c55a17d452e6999957af14accddeb11a Mon Sep 17 00:00:00 2001
From: flounder5 <25795672+flounder5@users.noreply.github.com>
Date: Fri, 15 Dec 2023 14:22:02 -0500
Subject: [PATCH] Use new builder. Fixed repo name.

---
 .github/workflows/workflow-build.yml |  6 +++---
 Makefile                             | 23 ++++++++++++++++-------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/workflow-build.yml b/.github/workflows/workflow-build.yml
index 6d3e156..dc56c04 100644
--- a/.github/workflows/workflow-build.yml
+++ b/.github/workflows/workflow-build.yml
@@ -18,12 +18,12 @@ jobs:
 
       - name: Docker build branch
         run: make docker
-        if: ${{ github.ref_type == 'branch' }}
+        if: ${{ github.ref_type == 'branch' && github.ref_name != 'main' }}
 
       - name: Docker build main
-        run: make docker ARGS="-t latest"
+        run: make docker_main
         if: ${{ github.ref_type == 'branch' && github.ref_name == 'main' }}
 
       - name: Docker build tag
-        run: make docker ARGS="-t ${{github.ref_name}}"
+        run: make docker_tag TAG="${{github.ref_name}}"
         if: ${{ github.ref_type == 'tag' }}
diff --git a/Makefile b/Makefile
index c5b00e9..3c72392 100644
--- a/Makefile
+++ b/Makefile
@@ -2,12 +2,13 @@ ROOT_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 
 CONTAINER_CODE_DIR=/opt/code
 
-#TODO - registry var needs to move elsewhere. Builder?
-DOCKER_REGISTRY=index.docker.io/flounder5
+DOCKER_REGISTRY=index.docker.io/flounderpinto
+
 DOCKER_REPO=runner-bash
-DOCKER_BUILD_CMD=dockerBuildStandard -e ${DOCKER_REGISTRY} -r ${DOCKER_REPO} ${ARGS}
-#TODO
-DOCKER_BUILDER_IMAGE=flounder5/builder-docker:v0.0.6
+DOCKER_BUILD_BRANCH_CMD=dockerBuildStandardBranch -e ${DOCKER_REGISTRY} -r ${DOCKER_REPO} ${ARGS}
+DOCKER_BUILD_MAIN_CMD=dockerBuildStandardMain -e ${DOCKER_REGISTRY} -r ${DOCKER_REPO} ${ARGS}
+DOCKER_BUILD_TAG_CMD=dockerBuildStandardTag ${TAG} -e ${DOCKER_REGISTRY} -r ${DOCKER_REPO} ${ARGS}
+DOCKER_BUILDER_IMAGE=flounderpinto/builder-docker:v0.0.10
 DOCKER_BUILDER_PULL_CMD=docker pull ${DOCKER_BUILDER_IMAGE}
 DOCKER_BUILDER_RUN_CMD=${DOCKER_BUILDER_PULL_CMD} && \
     docker run \
@@ -15,12 +16,20 @@ DOCKER_BUILDER_RUN_CMD=${DOCKER_BUILDER_PULL_CMD} && \
         -v /var/run/docker.sock:/var/run/docker.sock \
         -v ${HOME}/.docker:/tmp/.docker:ro \
         -v ${ROOT_DIR}:${CONTAINER_CODE_DIR} \
+        -w ${CONTAINER_CODE_DIR} \
         ${DOCKER_BUILDER_IMAGE}
 
-.PHONY: docker
+.PHONY: docker docker_main docker_tag
 
 docker:
-	${DOCKER_BUILDER_RUN_CMD} ${DOCKER_BUILD_CMD}
+	${DOCKER_BUILDER_RUN_CMD} ${DOCKER_BUILD_BRANCH_CMD}
+
+docker_main:
+	${DOCKER_BUILDER_RUN_CMD} ${DOCKER_BUILD_MAIN_CMD}
+
+docker_tag:
+	test ${TAG}
+	${DOCKER_BUILDER_RUN_CMD} ${DOCKER_BUILD_TAG_CMD}
 
 #Everything right of the pipe is order-only prerequisites.
 all: | docker
\ No newline at end of file