From b80ee9d10a7fc6038e062c1bdd69d9edd819cb27 Mon Sep 17 00:00:00 2001
From: Giles Knap <giles.knap@diamond.ac.uk>
Date: Thu, 7 Mar 2024 07:52:33 +0000
Subject: [PATCH] switch to bsp based naming for images

---
 .github/workflows/build.yml      | 16 +++++++++-------
 Dockerfile => Dockerfile.beatnik |  0
 README.md                        | 27 ++++++++++++++++++++-------
 3 files changed, 29 insertions(+), 14 deletions(-)
 rename Dockerfile => Dockerfile.beatnik (100%)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d1df902..b35043f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,13 +16,13 @@ jobs:
       max-parallel: 1 # take advantage of caching
       matrix:
         target: [developer, runtime]
-        include:
-          - os: ubuntu-latest
-            platforms: linux/amd64
+        # add more targets here and add a Dockerfile.${{ matrix.target }} to the repo
+        target_architecture: [beatnik]
 
-    runs-on: ${{ matrix.os }}
+
+    runs-on: ubuntu-latest
     env:
-      TAG: ghcr.io/${{ github.repository_owner }}/${{ github.event.repository.name }}-${{ matrix.target }}
+      TAG: ghcr.io/${{ github.repository_owner }}/rtems-${{ matrix.target_architecture }}-${{ matrix.target }}
     steps:
 
       - name: Log in to GitHub Docker Registry
@@ -38,10 +38,11 @@ jobs:
       - name: Build image
         uses: docker/build-push-action@v5
         with:
+          file: Dockerfile.${{ matrix.target }}
           target: ${{ matrix.target }}
           tags: ${{ env.TAG }}:${{ github.ref_name }},${{ env.TAG }}:latest
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+          cache-from: type=gha,scope=${{ matrix.target }}
+          cache-to: type=gha,mode=max,scope=${{ matrix.target }}
           load: true
 
       - name: Test image
@@ -51,5 +52,6 @@ jobs:
         if: ${{ github.event_name == 'push' && github.ref_type == 'tag' }}
         uses: docker/build-push-action@v5
         with:
+          file: Dockerfile.${{ matrix.target }}
           tags: ${{ env.TAG }}:${{ github.ref_name }},${{ env.TAG }}:latest
           push: true
diff --git a/Dockerfile b/Dockerfile.beatnik
similarity index 100%
rename from Dockerfile
rename to Dockerfile.beatnik
diff --git a/README.md b/README.md
index fc4b883..77a2fdd 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,27 @@
-A container that makes the RTEMS powerpc beatnik Board Support Package (BSP).
+RTEMS Board Support Packages
+============================
+
+A container that makes the RTEMS Board Support Packages (BSPs).
 
 This container gets the sources from RTEMS releases, builds the toolchain and then compiles the BSP.
 
-The developer target serves as an archive for the source code. The runtime target is a minmal container with the RTEMS powerpc-beatnik BSP only, intended to be used as a base for epics-base builds.
+The developer target serves as an archive for the source code. The runtime target is a minimal container with the RTEMS BSP only, intended to be used as a base image for epics-base builds (see https://github.com/epics-containers/epics-base)
+
+Supported BSPs
+--------------
+
+The repo is designed to allow for multiple target architectures. At present the list of BSPs is only 1 long:
+
+- mvme5500
+  - rtems version: 6.1-rc2
+  - patches for MVME5500 boards used at DLS
+  - legacy network stack
+  - processor is m4700 with hardware floating point support
+
 
-The current configuration is:-
-- rtems version: 6.1-rc2
-- patches for MVME5500 boards used at DLS
-- legacy network stack
+Acknowledgements
+================
 
-This container can be run to experiment with building components with the RSP and prebuilt rtems6 toolchain.
+This is all possible due to the hard work of the RTEMS community.
 
 See https://docs.rtems.org/branches/master/user/start/index.html