refactor folder structure

Author: anthony-nhs

.github/workflows/build_all_images.yml

@@ -17,7 +17,8 @@ jobs:
       tag_latest: ${{ inputs.tag_latest }}
       docker_tag: ${{ inputs.docker_tag }}
       container_name: base
-  package_non_base_docker_image:
+      base_folder: "."
+  package_language_docker_image:
     needs:
       - package_base_docker_image
     strategy:
@@ -33,9 +34,10 @@ jobs:
       tag_latest: ${{ inputs.tag_latest }}
       docker_tag: ${{ inputs.docker_tag }}
       container_name: ${{ matrix.container_name }}
-  package_product_docker_image:
+      base_folder: "languages"
+  package_project_docker_image:
     needs:
-      - package_non_base_docker_image
+      - package_language_docker_image
     strategy:
       fail-fast: false
       matrix:
@@ -46,3 +48,4 @@ jobs:
       tag_latest: ${{ inputs.tag_latest }}
       docker_tag: ${{ inputs.docker_tag }}
       container_name: ${{ matrix.container_name }}
+      base_folder: "projects"

.github/workflows/build_multi_arch_image.yml

@@ -11,6 +11,9 @@ name: Build and push docker image
       container_name:
         required: true
         type: string
+      base_folder:
+        required: true
+        type: string
 
 jobs:
   build_and_push_image:
@@ -81,8 +84,8 @@ jobs:
           DOCKER_TAG: '${{ inputs.docker_tag }}'
           CONTAINER_NAME: '${{ inputs.container_name }}'
           BASE_VERSION: ${{ inputs.docker_tag}}
-          PLATFORM: linux/${{ matrix.arch }}
           IMAGE_TAG: ":${{ inputs.docker_tag }}-${{ matrix.arch }}"
+          BASE_FOLDER: "${{ inputs.base_folder }}"
       - name: Check docker vulnerabilities - json output
         uses: aquasecurity/trivy-action@b6643a29fecd7f34b3597bc6acb0a98b03d33ff8
         with:

Makefile

@@ -21,11 +21,10 @@ install-node:
 install-hooks: install-python
 	poetry run pre-commit install --install-hooks --overwrite
 
-build-image: guard-CONTAINER_NAME guard-BASE_VERSION guard-PLATFORM
+build-image: guard-CONTAINER_NAME guard-BASE_VERSION guard-BASE_FOLDER
 	npx devcontainer build \
-		--workspace-folder ./src/$${CONTAINER_NAME}/ \
+		--workspace-folder ./src/$${BASE_FOLDER}/$${CONTAINER_NAME} \
 		--push false \
-		--platform $${PLATFORM} \
 		--image-name "${CONTAINER_PREFIX}$${CONTAINER_NAME}${IMAGE_TAG}" 
 
 scan-image: guard-CONTAINER_NAME

README.md

@@ -57,10 +57,28 @@ For pull requests, an image is pushed with tag `pr-<pull-request-id>-<short comm
 On merges to main, a new release is created, and images are tagged with `latest` and the version of the release.
 
 # Local testing
-For local testing, you can run
+For local testing, you can run this to build the base image
 ```
-CONTAINER_NAME=base BASE_VERSION=latest make build-image
+CONTAINER_NAME=base \
+  BASE_VERSION=latest \
+  BASE_FOLDER=. \
+  make build-image
 ``` 
+or this to build a language image
+```
+CONTAINER_NAME=node_24_python_3_12 \
+  BASE_VERSION=latest \
+  BASE_FOLDER=languages \
+  make build-image
+``` 
+or this to build a project image
+```
+CONTAINER_NAME=fhir_facade_api \
+  BASE_VERSION=latest \
+  BASE_FOLDER=projects \
+  make build-image
+``` 
+
 to build a local image, and then
 ```
 CONTAINER_NAME=base BASE_VERSION=latest make scan-image

src/fhir_facade_api/trivy.yaml

@@ -4,7 +4,7 @@
     "name": "EPS Devcontainer node_24 python_3.13",
     // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
     "build": {
-      "dockerfile": "../../common/Dockerfile",
+      "dockerfile": "../../../common/Dockerfile",
       "args": {
         "BASE_VERSION": "${localEnv:BASE_VERSION}",
         "CONTAINER_NAME": "eps_devcontainer_node_24_python_3_13"