move container images and github actions path

Signed-off-by: Ryan Cook <[email protected]>

Author: cooktheryan

.github/workflows/images.yml

@@ -79,7 +79,7 @@ jobs:
           platforms: linux/amd64,linux/arm64
           cache-from: type=gha
           cache-to: type=gha,mode=max
-          file: Containerfile
+          file: src/Containerfile
 
       - name: Generate artifact attestation
         uses: actions/attest-build-provenance@v1
@@ -99,7 +99,7 @@ jobs:
           platforms: linux/amd64,linux/arm64
           cache-from: type=gha
           cache-to: type=gha,mode=max
-          file: Containerfile
+          file: src/Containerfile
 
   build_and_publish_pathservice_image:
     name: Push pathservice container image to GHCR and QUAY
@@ -163,7 +163,7 @@ jobs:
           platforms: linux/amd64,linux/arm64
           cache-from: type=gha
           cache-to: type=gha,mode=max
-          file: Containerfile.ps
+          file: pathservice/Containerfile
 
       - name: Generate artifact attestation
         uses: actions/attest-build-provenance@v1
@@ -183,4 +183,4 @@ jobs:
           platforms: linux/amd64,linux/arm64
           cache-from: type=gha
           cache-to: type=gha,mode=max
-          file: Containerfile.ps
+          file: pathservice/Containerfile

Makefile

@@ -47,14 +47,15 @@ yaml-lint: ## Lint yaml files
 	$(CMD_PREFIX) yamllint -c .yamllint.yaml deploy --strict
 
 ##@ Artifacts - Command to build and publish artifacts
-ui-image: Containerfile ## Build continaer image for the InstructLab UI
-	$(ECHO_PREFIX) printf "  %-12s Containerfile\n" "[docker]"
-	$(CMD_PREFIX) docker build -f Containerfile -t ghcr.io/instructlab/ui/ui:$(TAG) .
+ui-image: src/Containerfile ## Build container image for the InstructLab UI
+	$(ECHO_PREFIX) printf "  %-12s src/Containerfile\n" "[docker]"
+	$(CMD_PREFIX) docker build -f src/Containerfile -t ghcr.io/instructlab/ui/ui:$(TAG) .
 	$(CMD_PREFIX) docker tag ghcr.io/instructlab/ui/ui:$(TAG) ghcr.io/instructlab/ui/ui:main
 
-ps-image: Containerfile.ps ## Build continaer image for the pathservice
-	$(ECHO_PREFIX) printf "  %-12s Containerfile.ps\n" "[docker]"
-	$(CMD_PREFIX) docker build -f Containerfile.ps -t ghcr.io/instructlab/ui/pathservice:$(TAG) .
+
+ps-image: pathservice/Containerfile ## Build container image for the InstructLab PathService
+	$(ECHO_PREFIX) printf "  %-12s pathservice/Containerfile\n" "[docker]"
+	$(CMD_PREFIX) docker build -f pathservice/Containerfile -t ghcr.io/instructlab/ui/pathservice:$(TAG) .
 	$(CMD_PREFIX) docker tag ghcr.io/instructlab/ui/pathservice:$(TAG) ghcr.io/instructlab/ui/pathservice:main
 
 ##@ Local Dev - Local machine based deployment of the UI stack