From 70902f6eb860b23868ffca44bc5a0ef79c3ea618 Mon Sep 17 00:00:00 2001
From: Nick Evans <2616208+nickevansuk@users.noreply.github.com>
Date: Thu, 25 May 2023 12:18:42 +0100
Subject: [PATCH 01/89] Update openactive-test-suite.yml

---
 .github/workflows/openactive-test-suite.yml | 39 +++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/.github/workflows/openactive-test-suite.yml b/.github/workflows/openactive-test-suite.yml
index f72c6074..76f9b725 100644
--- a/.github/workflows/openactive-test-suite.yml
+++ b/.github/workflows/openactive-test-suite.yml
@@ -292,3 +292,42 @@ jobs:
       - name: Push to Nuget
         if: "! contains(toJSON(github.event.commits.*.message), '[no-release]')"
         run: dotnet nuget push "./Fakes/OpenActive.FakeDatabase.NET/**/*.nupkg" -k ${{secrets.NUGET_API_KEY}} --skip-duplicate -s https://api.nuget.org/v3/index.json
+
+  build-and-push-docker-image:
+    # Publish to GitHub Container Registry
+    # Master branch only
+    if: ${{ github.ref == 'refs/heads/master' }}
+    needs:
+      - core
+      - framework
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    env: 
+      REGISTRY: ghcr.io
+      IMAGE_NAME: ${{ github.repository }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

From e8394d071745e61ee0e34f4ce67b0870a6b061a7 Mon Sep 17 00:00:00 2001
From: nickevansuk <2616208+nickevansuk@users.noreply.github.com>
Date: Thu, 25 May 2023 13:48:31 +0100
Subject: [PATCH 02/89] Add Dockerfile

---
 Dockerfile | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 Dockerfile

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 00000000..1d5a9210
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,41 @@
+# https://hub.docker.com/_/microsoft-dotnet
+FROM mcr.microsoft.com/dotnet/sdk:3.1 AS build
+WORKDIR /source
+
+# Copy csproj and restore as distinct layers
+COPY *.sln .
+COPY Examples/BookingSystem.AspNetCore.IdentityServer/BookingSystem.AspNetCore.IdentityServer.csproj ./Examples/BookingSystem.AspNetCore.IdentityServer/
+COPY Examples/BookingSystem.AspNetCore/BookingSystem.AspNetCore.csproj ./Examples/BookingSystem.AspNetCore/
+COPY Fakes/OpenActive.FakeDatabase.NET/OpenActive.FakeDatabase.NET.csproj ./Fakes/OpenActive.FakeDatabase.NET/
+COPY Fakes/OpenActive.FakeDatabase.NET.Tests/OpenActive.FakeDatabase.NET.Tests.csproj ./Fakes/OpenActive.FakeDatabase.NET.Tests/
+COPY OpenActive.Server.NET/OpenActive.Server.NET.csproj ./OpenActive.Server.NET/
+COPY OpenActive.Server.NET.Tests/OpenActive.Server.NET.Tests.csproj ./OpenActive.Server.NET.Tests/
+COPY Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj ./Examples/BookingSystem.AspNetFramework/
+COPY Examples/BookingSystem.AspNetFramework.Tests/BookingSystem.AspNetFramework.Tests.csproj ./Examples/BookingSystem.AspNetFramework.Tests/
+RUN dotnet restore
+
+# Copy everything else
+COPY Examples/. ./Examples/
+COPY /Fakes/OpenActive.FakeDatabase.NET/. ./Fakes/OpenActive.FakeDatabase.NET/
+COPY /OpenActive.Server.NET/. ./OpenActive.Server.NET/
+
+# Build .NET Core Authentication Authority Reference Implementation
+WORKDIR /source/Examples/BookingSystem.AspNetCore.IdentityServer
+RUN dotnet publish -c release -o /app-id --no-restore
+
+# Build .NET Core Booking Server Reference Implementation
+WORKDIR /source/Examples/BookingSystem.AspNetCore
+RUN dotnet publish -c release -o /app --no-restore
+
+# target for identity-server
+# See https://learn.microsoft.com/en-us/aspnet/core/security/docker-https to run
+FROM mcr.microsoft.com/dotnet/aspnet:3.1 AS identity-server
+WORKDIR /app-id
+COPY --from=build /app-id ./
+ENTRYPOINT ["dotnet", "BookingSystem.AspNetCore.IdentityServer.dll"]
+
+# default target
+FROM mcr.microsoft.com/dotnet/aspnet:3.1
+WORKDIR /app
+COPY --from=build /app ./
+ENTRYPOINT ["dotnet", "BookingSystem.AspNetCore.dll"]
\ No newline at end of file

From c28aacb629d92e2ecba7bb7fa845154ef9ef9d19 Mon Sep 17 00:00:00 2001
From: nickevansuk <2616208+nickevansuk@users.noreply.github.com>
Date: Thu, 25 May 2023 13:55:33 +0100
Subject: [PATCH 03/89] Commit to check

---
 .github/workflows/openactive-test-suite.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/openactive-test-suite.yml b/.github/workflows/openactive-test-suite.yml
index 76f9b725..75777ff6 100644
--- a/.github/workflows/openactive-test-suite.yml
+++ b/.github/workflows/openactive-test-suite.yml
@@ -296,10 +296,10 @@ jobs:
   build-and-push-docker-image:
     # Publish to GitHub Container Registry
     # Master branch only
-    if: ${{ github.ref == 'refs/heads/master' }}
-    needs:
-      - core
-      - framework
+    # if: ${{ github.ref == 'refs/heads/master' }}
+    # needs:
+    #  - core
+    #  - framework
     runs-on: ubuntu-latest
     permissions:
       contents: read

From 5971727967ac906b224e51316cf42a4e788dc59e Mon Sep 17 00:00:00 2001
From: nickevansuk <2616208+nickevansuk@users.noreply.github.com>
Date: Thu, 25 May 2023 14:56:00 +0100
Subject: [PATCH 04/89] Mix metadata and double build

---
 .github/workflows/openactive-test-suite.yml | 47 ++++++++++++++++++---
 Dockerfile                                  |  4 +-
 2 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/openactive-test-suite.yml b/.github/workflows/openactive-test-suite.yml
index 75777ff6..bf712a1c 100644
--- a/.github/workflows/openactive-test-suite.yml
+++ b/.github/workflows/openactive-test-suite.yml
@@ -306,10 +306,17 @@ jobs:
       packages: write
     env: 
       REGISTRY: ghcr.io
-      IMAGE_NAME: ${{ github.repository }}
+      #IMAGE_NAME: ${{ github.repository }}
     steps:
-      - name: Checkout repository
+      - name: Checkout
         uses: actions/checkout@v3
+        with:
+          fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
+      - name: Install Nerdbank.GitVersioning
+        run: cp Directory.Build.props.template Directory.Build.props
+      - name: Get current version
+        uses: dotnet/nbgv@master
+        id: nbgv
 
       - name: Log in to the Container registry
         uses: docker/login-action@v2
@@ -318,16 +325,44 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
+      - name: Extract metadata (tags, labels) for Booking System
+        id: meta-booking
         uses: docker/metadata-action@v4
         with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          images: ${{ env.REGISTRY }}/OpenActive/Reference.BookingSystem
+          labels: |
+            org.opencontainers.image.title=OpenActive Reference Implementation - Booking System
+            org.opencontainers.image.description=Reference Implementation for open data publishing and Open Booking API implementation
+            org.opencontainers.image.vendor=OpenActive
+          tags: |
+            type=semver,pattern={{version}},value=v${{ steps.nbgv.outputs.SimpleVersion }}
 
-      - name: Build and push Docker image
+      - name: Extract metadata (tags, labels) for Identity Server
+        id: meta-id
+        uses: docker/metadata-action@v4
+        with:
+          images: ${{ env.REGISTRY }}/OpenActive/Reference.BookingSystem.Identity
+          labels: |
+            org.opencontainers.image.title=OpenActive Reference Implementation - Identity Server
+            org.opencontainers.image.description=Reference Implementation for OpenID Connect identity server implementation for OpenActive
+            org.opencontainers.image.vendor=OpenActive
+          tags: |
+            type=semver,pattern={{version}},value=v${{ steps.nbgv.outputs.SimpleVersion }}
+
+      - name: Build and push Docker image for Booking System
         uses: docker/build-push-action@v4
         with:
           context: .
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+          target: booking-server
+
+      - name: Build and push Docker image for Identity Server
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta-id.outputs.tags }}
+          labels: ${{ steps.meta-id.outputs.labels }}
+          target: identity-server
diff --git a/Dockerfile b/Dockerfile
index 1d5a9210..86705341 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -34,8 +34,8 @@ WORKDIR /app-id
 COPY --from=build /app-id ./
 ENTRYPOINT ["dotnet", "BookingSystem.AspNetCore.IdentityServer.dll"]
 
-# default target
-FROM mcr.microsoft.com/dotnet/aspnet:3.1
+# default target; for booking-server
+FROM mcr.microsoft.com/dotnet/aspnet:3.1 AS booking-server
 WORKDIR /app
 COPY --from=build /app ./
 ENTRYPOINT ["dotnet", "BookingSystem.AspNetCore.dll"]
\ No newline at end of file

From 7e5f72670d234eba9116af361072f0f1115084ff Mon Sep 17 00:00:00 2001
From: nickevansuk <2616208+nickevansuk@users.noreply.github.com>
Date: Thu, 25 May 2023 15:00:44 +0100
Subject: [PATCH 05/89] Attempt fix

---
 .github/workflows/openactive-test-suite.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/openactive-test-suite.yml b/.github/workflows/openactive-test-suite.yml
index bf712a1c..daf27581 100644
--- a/.github/workflows/openactive-test-suite.yml
+++ b/.github/workflows/openactive-test-suite.yml
@@ -306,7 +306,7 @@ jobs:
       packages: write
     env: 
       REGISTRY: ghcr.io
-      #IMAGE_NAME: ${{ github.repository }}
+      IMAGE_NAME: ${{ github.repository }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3

From 535f87b8949bc58d6eb7f472b8ab959126c71410 Mon Sep 17 00:00:00 2001
From: nickevansuk <2616208+nickevansuk@users.noreply.github.com>
Date: Thu, 25 May 2023 15:02:22 +0100
Subject: [PATCH 06/89] Attempt 2

---
 .github/workflows/openactive-test-suite.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/openactive-test-suite.yml b/.github/workflows/openactive-test-suite.yml
index daf27581..2b04e7ed 100644
--- a/.github/workflows/openactive-test-suite.yml
+++ b/.github/workflows/openactive-test-suite.yml
@@ -329,7 +329,7 @@ jobs:
         id: meta-booking
         uses: docker/metadata-action@v4
         with:
-          images: ${{ env.REGISTRY }}/OpenActive/Reference.BookingSystem
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           labels: |
             org.opencontainers.image.title=OpenActive Reference Implementation - Booking System
             org.opencontainers.image.description=Reference Implementation for open data publishing and Open Booking API implementation

From 458ea6d064f1b6fa06f3493538ade3f5a3265760 Mon Sep 17 00:00:00 2001
From: nickevansuk <2616208+nickevansuk@users.noreply.github.com>
Date: Thu, 25 May 2023 15:07:12 +0100
Subject: [PATCH 07/89] Fix

---
 .github/workflows/openactive-test-suite.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/openactive-test-suite.yml b/.github/workflows/openactive-test-suite.yml
index 2b04e7ed..f8f1ec58 100644
--- a/.github/workflows/openactive-test-suite.yml
+++ b/.github/workflows/openactive-test-suite.yml
@@ -306,7 +306,7 @@ jobs:
       packages: write
     env: 
       REGISTRY: ghcr.io
-      IMAGE_NAME: ${{ github.repository }}
+      # IMAGE_NAME: ${{ github.repository }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -329,7 +329,7 @@ jobs:
         id: meta-booking
         uses: docker/metadata-action@v4
         with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          images: ${{ env.REGISTRY }}/OpenActive/Reference.BookingSystem
           labels: |
             org.opencontainers.image.title=OpenActive Reference Implementation - Booking System
             org.opencontainers.image.description=Reference Implementation for open data publishing and Open Booking API implementation
@@ -354,8 +354,8 @@ jobs:
         with:
           context: .
           push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
+          tags: ${{ steps.meta-booking.outputs.tags }}
+          labels: ${{ steps.meta-booking.outputs.labels }}
           target: booking-server
 
       - name: Build and push Docker image for Identity Server

From 84928d7d89ae6bc7aa98316e4b8a6c6ed1f89cae Mon Sep 17 00:00:00 2001
From: nickevansuk <2616208+nickevansuk@users.noreply.github.com>
Date: Thu, 25 May 2023 15:26:34 +0100
Subject: [PATCH 08/89] Add release notes

---
 .github/workflows/openactive-test-suite.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/openactive-test-suite.yml b/.github/workflows/openactive-test-suite.yml
index f8f1ec58..25512754 100644
--- a/.github/workflows/openactive-test-suite.yml
+++ b/.github/workflows/openactive-test-suite.yml
@@ -257,6 +257,8 @@ jobs:
             This release contains minor amendments based on updates to the [OpenActive Vocabulary](https://openactive.io/ns/) (codified by the [Data Models](https://github.com/openactive/data-models)), and the latest version of the [Dataset Site Template](https://github.com/openactive/dataset-site-template).
             
             Published to Nuget: [OpenActive.Server.NET](https://www.nuget.org/packages/OpenActive.Server.NET/${{ steps.nbgv.outputs.SimpleVersion }}) and [OpenActive.FakeDatabase.NET](https://www.nuget.org/packages/OpenActive.FakeDatabase.NET/${{ steps.nbgv.outputs.SimpleVersion }}).
+
+            Published to GitHub Container Registry: [reference.bookingsystem](https://github.com/openactive/OpenActive.Server.NET/pkgs/container/reference.bookingsystem) and [reference.bookingsystem.identity](https://github.com/openactive/OpenActive.Server.NET/pkgs/container/reference.bookingsystem.identity)
           draft: false
           prerelease: false
 
@@ -332,7 +334,7 @@ jobs:
           images: ${{ env.REGISTRY }}/OpenActive/Reference.BookingSystem
           labels: |
             org.opencontainers.image.title=OpenActive Reference Implementation - Booking System
-            org.opencontainers.image.description=Reference Implementation for open data publishing and Open Booking API implementation
+            org.opencontainers.image.description=Reference Implementation for OpenActive data publishing and Open Booking API implementation
             org.opencontainers.image.vendor=OpenActive
           tags: |
             type=semver,pattern={{version}},value=v${{ steps.nbgv.outputs.SimpleVersion }}
@@ -344,7 +346,7 @@ jobs:
           images: ${{ env.REGISTRY }}/OpenActive/Reference.BookingSystem.Identity
           labels: |
             org.opencontainers.image.title=OpenActive Reference Implementation - Identity Server
-            org.opencontainers.image.description=Reference Implementation for OpenID Connect identity server implementation for OpenActive
+            org.opencontainers.image.description=Reference Implementation for OpenID Connect implementation for OpenActive
             org.opencontainers.image.vendor=OpenActive
           tags: |
             type=semver,pattern={{version}},value=v${{ steps.nbgv.outputs.SimpleVersion }}

From 4509c3968160eca14aac20958d8258da539af267 Mon Sep 17 00:00:00 2001
From: nickevansuk <2616208+nickevansuk@users.noreply.github.com>
Date: Thu, 25 May 2023 16:07:26 +0100
Subject: [PATCH 09/89] Update README

---
 README.md | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2f65f5dc..a2c2dbb8 100644
--- a/README.md
+++ b/README.md
@@ -7,10 +7,24 @@ A readme is available within the [`OpenActive.Server.NET`](https://github.com/op
 
 Further documentation, including a step-by-step tutorial, can be found at https://tutorials.openactive.io/open-booking-sdk/.
 
-# OpenActive Reference Implementation [![OpenActive Test Suite](https://github.com/openactive/OpenActive.Server.NET/workflows/OpenActive%20Reference%20Implementation/badge.svg?branch=master)](https://certificates.reference-implementation.openactive.io/examples/all-features/controlled/)
+# OpenActive Reference Implementation [![OpenActive Reference Implementation](https://github.com/openactive/OpenActive.Server.NET/actions/workflows/openactive-test-suite.yml/badge.svg?branch=master))](https://certificates.reference-implementation.openactive.io/examples/all-features/controlled/)
 [`BookingSystem.AspNetCore`](https://github.com/openactive/OpenActive.Server.NET/tree/master/Examples/BookingSystem.AspNetCore) provides an example use of the OpenActive.Server.NET library, as a fully standards compliant reference implementation of the OpenActive specifications, including the Open Booking API.
 
 This is designed to have its code copied-and-pasted to provide a quick working starting point for any implementation.
 
+## Docker
+
+Docker can be used to run the reference implementation locally or within a CI environment:
+
+```
+docker run -it --rm -p 5000:80 --name openactive_refimpl -e ASPNETCORE_ENVIRONMENT=no-auth ghcr.io/openactive/reference.bookingsystem:0.14.12
+```
+
+Then visit `http://localhost:5000/OpenActive`.
+
+See https://learn.microsoft.com/en-us/aspnet/core/security/docker-https to run `https://localhost:5001/OpenActive`.
+
+
 # OpenActive.FakeDatabase.NET [![Nuget](https://img.shields.io/nuget/v/OpenActive.FakeDatabase.NET.svg)](https://www.nuget.org/packages/OpenActive.FakeDatabase.NET/) [![OpenActive.FakeDatabase.NET.Tests](https://github.com/openactive/OpenActive.Server.NET/workflows/OpenActive.FakeDatabase.NET.Tests/badge.svg?branch=master)](https://github.com/openactive/OpenActive.Server.NET/actions?query=workflow%3AOpenActive.FakeDatabase.NET.Tests)
 [`OpenActive.FakeDatabase.NET`](https://github.com/openactive/OpenActive.Server.NET/tree/master/Fakes/OpenActive.FakeDatabase.NET) is an in-memory database that is used by BookingSystem.AspNetCore for illustration purposes. It can be added as a dependency to your project during the initial stages of implementation, to get a conformant test implementation as a starting position.
+

From 653c9d595384cf2294f0786212b775a1ddab4069 Mon Sep 17 00:00:00 2001
From: nickevansuk <2616208+nickevansuk@users.noreply.github.com>
Date: Thu, 25 May 2023 18:57:16 +0100
Subject: [PATCH 10/89] Add docker test

---
 .github/workflows/docker-test.yaml | 78 ++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 .github/workflows/docker-test.yaml

diff --git a/.github/workflows/docker-test.yaml b/.github/workflows/docker-test.yaml
new file mode 100644
index 00000000..1031b8fe
--- /dev/null
+++ b/.github/workflows/docker-test.yaml
@@ -0,0 +1,78 @@
+name: Docker Image Integration Test
+
+on:
+  registry_package:
+    types: [ published ]
+  push:
+    branches: [ feature/docker-image ]
+
+jobs:
+  tests:
+    # Only run after 'reference.bookingsystem' is published 
+    # if: ${{ github.event.package.name == 'reference.bookingsystem' }}
+    runs-on: ubuntu-latest
+    container: node:14
+    
+    services:
+      # Label used to access the service container
+      reference-bookingsystem:
+        # Docker Hub image
+        image: ghcr.io/openactive/reference.bookingsystem:latest # ${{ github.event.package.package_version.version }}
+        # Config for postgres
+        env:
+          ASPNETCORE_ENVIRONMENT: all-features
+          ApplicationHostBaseUrl: https://reference-bookingsystem
+        # Set health checks to wait until postgres has started
+        options: >-
+          --health-cmd "curl -f http://localhost/OpenActive"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          # Maps tcp port 80 and 443 on service container to the host
+          - 80:80
+          - 443:443
+
+      # Label used to access the service container
+      reference-bookingsystem-identity:
+        # Docker Hub image
+        image: ghcr.io/openactive/reference.bookingsystem.identity:latest # ${{ github.event.package.package_version.version }}
+        # Config for postgres
+        env:
+          ASPNETCORE_ENVIRONMENT: all-features
+          ApplicationHostBaseUrl: https://reference-bookingsystem-identity
+        # Set health checks to wait until postgres has started
+        options: >-
+          --health-cmd "curl -f http://localhost/.well-known/openid-configuration"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          # Maps tcp port 80 and 443 on service container to the host
+          - 80:80
+          - 443:443
+
+    steps:
+      - name: Checkout OpenActive Test Suite
+        uses: actions/checkout@v2
+        with:
+          repository: openactive/openactive-test-suite
+          path: tests
+      - name: Install OpenActive Test Suite
+        run: npm install
+        working-directory: tests
+      - name: Run OpenActive Integration Tests
+        run: npm start
+        env:
+          FORCE_COLOR: 1
+          NODE_CONFIG: |
+            {"broker": {"outputPath": "../../output/", "datasetSiteUrl": "https://reference-bookingsystem/openactive"}, "integrationTests": { "outputPath": "../../output/", "useRandomOpportunities": true }}
+          NODE_ENV: .example.all-features
+          NODE_APP_INSTANCE: ci
+        working-directory: tests
+      - name: Upload test output as artifact
+        uses: actions/upload-artifact@v2
+        if: ${{ success() || failure() }}
+        with:
+          name: docker-test
+          path: ./tests/output/

From 2aeb063be22836816d86120b77121ab0df6f7892 Mon Sep 17 00:00:00 2001
From: nickevansuk <2616208+nickevansuk@users.noreply.github.com>
Date: Thu, 25 May 2023 19:01:06 +0100
Subject: [PATCH 11/89] Fix

---
 .github/workflows/docker-test.yaml          | 8 --------
 .github/workflows/openactive-test-suite.yml | 4 ++--
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/docker-test.yaml b/.github/workflows/docker-test.yaml
index 1031b8fe..5916cde1 100644
--- a/.github/workflows/docker-test.yaml
+++ b/.github/workflows/docker-test.yaml
@@ -28,10 +28,6 @@ jobs:
           --health-interval 10s
           --health-timeout 5s
           --health-retries 5
-        ports:
-          # Maps tcp port 80 and 443 on service container to the host
-          - 80:80
-          - 443:443
 
       # Label used to access the service container
       reference-bookingsystem-identity:
@@ -47,10 +43,6 @@ jobs:
           --health-interval 10s
           --health-timeout 5s
           --health-retries 5
-        ports:
-          # Maps tcp port 80 and 443 on service container to the host
-          - 80:80
-          - 443:443
 
     steps:
       - name: Checkout OpenActive Test Suite
diff --git a/.github/workflows/openactive-test-suite.yml b/.github/workflows/openactive-test-suite.yml
index 25512754..9cf768d8 100644
--- a/.github/workflows/openactive-test-suite.yml
+++ b/.github/workflows/openactive-test-suite.yml
@@ -2,8 +2,8 @@ name: Ref Impl
 on:
   push:
     branches: [ master ]
-  pull_request:
-    branches: [ master ]
+  # pull_request:
+  # branches: [ master ]
 
 jobs:
   test-server:

From 6472772969beac159f5a52fc09ff87013ac42d36 Mon Sep 17 00:00:00 2001
From: nickevansuk <2616208+nickevansuk@users.noreply.github.com>
Date: Thu, 25 May 2023 19:04:12 +0100
Subject: [PATCH 12/89] Try

---
 .github/workflows/docker-test.yaml | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/docker-test.yaml b/.github/workflows/docker-test.yaml
index 5916cde1..e82ac80c 100644
--- a/.github/workflows/docker-test.yaml
+++ b/.github/workflows/docker-test.yaml
@@ -30,19 +30,19 @@ jobs:
           --health-retries 5
 
       # Label used to access the service container
-      reference-bookingsystem-identity:
-        # Docker Hub image
-        image: ghcr.io/openactive/reference.bookingsystem.identity:latest # ${{ github.event.package.package_version.version }}
-        # Config for postgres
-        env:
-          ASPNETCORE_ENVIRONMENT: all-features
-          ApplicationHostBaseUrl: https://reference-bookingsystem-identity
-        # Set health checks to wait until postgres has started
-        options: >-
-          --health-cmd "curl -f http://localhost/.well-known/openid-configuration"
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
+      # reference-bookingsystem-identity:
+      #   # Docker Hub image
+      #   image: ghcr.io/openactive/reference.bookingsystem.identity:latest # ${{ github.event.package.package_version.version }}
+      #   # Config for postgres
+      #   env:
+      #     ASPNETCORE_ENVIRONMENT: all-features
+      #     ApplicationHostBaseUrl: https://reference-bookingsystem-identity
+      #   # Set health checks to wait until postgres has started
+      #   options: >-
+      #     --health-cmd "curl -f http://localhost/.well-known/openid-configuration"
+      #     --health-interval 10s
+      #     --health-timeout 5s
+      #     --health-retries 5
 
     steps:
       - name: Checkout OpenActive Test Suite
@@ -58,7 +58,7 @@ jobs:
         env:
           FORCE_COLOR: 1
           NODE_CONFIG: |
-            {"broker": {"outputPath": "../../output/", "datasetSiteUrl": "https://reference-bookingsystem/openactive"}, "integrationTests": { "outputPath": "../../output/", "useRandomOpportunities": true }}
+            {"broker": {"outputPath": "../../output/", "datasetSiteUrl": "http://reference-bookingsystem/openactive"}, "integrationTests": { "outputPath": "../../output/", "useRandomOpportunities": true }}
           NODE_ENV: .example.all-features
           NODE_APP_INSTANCE: ci
         working-directory: tests

From 451cc5445ba31ecf0b728f056e080a6874817991 Mon Sep 17 00:00:00 2001
From: nickevansuk <2616208+nickevansuk@users.noreply.github.com>
Date: Thu, 25 May 2023 19:08:50 +0100
Subject: [PATCH 13/89] fix

---
 .github/workflows/docker-test.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-test.yaml b/.github/workflows/docker-test.yaml
index e82ac80c..a0b6a281 100644
--- a/.github/workflows/docker-test.yaml
+++ b/.github/workflows/docker-test.yaml
@@ -11,7 +11,7 @@ jobs:
     # Only run after 'reference.bookingsystem' is published 
     # if: ${{ github.event.package.name == 'reference.bookingsystem' }}
     runs-on: ubuntu-latest
-    container: node:14
+    container: node:14.19.1-bullseye
     
     services:
       # Label used to access the service container

From 58123f6b4c7f0d2948d9ca196d0f53e26be80aec Mon Sep 17 00:00:00 2001
From: nickevansuk <2616208+nickevansuk@users.noreply.github.com>
Date: Thu, 25 May 2023 19:17:56 +0100
Subject: [PATCH 14/89] Fix

---
 .github/workflows/docker-test.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-test.yaml b/.github/workflows/docker-test.yaml
index a0b6a281..81b6a126 100644
--- a/.github/workflows/docker-test.yaml
+++ b/.github/workflows/docker-test.yaml
@@ -46,7 +46,7 @@ jobs:
 
     steps:
       - name: Checkout OpenActive Test Suite
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: openactive/openactive-test-suite
           path: tests

From 76cbdfceded3059fa7e015bf40e968a2ce00cbf5 Mon Sep 17 00:00:00 2001
From: nickevansuk <2616208+nickevansuk@users.noreply.github.com>
Date: Fri, 26 May 2023 17:18:48 +0100
Subject: [PATCH 15/89] Remove HTTPS

---
 .github/workflows/docker-test.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-test.yaml b/.github/workflows/docker-test.yaml
index 81b6a126..65ad02eb 100644
--- a/.github/workflows/docker-test.yaml
+++ b/.github/workflows/docker-test.yaml
@@ -21,7 +21,7 @@ jobs:
         # Config for postgres
         env:
           ASPNETCORE_ENVIRONMENT: all-features
-          ApplicationHostBaseUrl: https://reference-bookingsystem
+          ApplicationHostBaseUrl: http://reference-bookingsystem
         # Set health checks to wait until postgres has started
         options: >-
           --health-cmd "curl -f http://localhost/OpenActive"

From ba795611bcedfc7792744cd567bf16f23f5d8a7a Mon Sep 17 00:00:00 2001
From: nickevansuk <2616208+nickevansuk@users.noreply.github.com>
Date: Fri, 26 May 2023 17:50:54 +0100
Subject: [PATCH 16/89] Fix

---
 .github/workflows/docker-test.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-test.yaml b/.github/workflows/docker-test.yaml
index 65ad02eb..f520e886 100644
--- a/.github/workflows/docker-test.yaml
+++ b/.github/workflows/docker-test.yaml
@@ -11,7 +11,7 @@ jobs:
     # Only run after 'reference.bookingsystem' is published 
     # if: ${{ github.event.package.name == 'reference.bookingsystem' }}
     runs-on: ubuntu-latest
-    container: node:14.19.1-bullseye
+    container: node:14.19.1
     
     services:
       # Label used to access the service container

From 195f7aed6473907fafd8f6a767936c9e1369ca74 Mon Sep 17 00:00:00 2001
From: nickevansuk <2616208+nickevansuk@users.noreply.github.com>
Date: Fri, 26 May 2023 17:54:21 +0100
Subject: [PATCH 17/89] Fix

---
 .github/workflows/docker-test.yaml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/docker-test.yaml b/.github/workflows/docker-test.yaml
index f520e886..c7bda55b 100644
--- a/.github/workflows/docker-test.yaml
+++ b/.github/workflows/docker-test.yaml
@@ -11,7 +11,7 @@ jobs:
     # Only run after 'reference.bookingsystem' is published 
     # if: ${{ github.event.package.name == 'reference.bookingsystem' }}
     runs-on: ubuntu-latest
-    container: node:14.19.1
+    # container: node:14.19.1
     
     services:
       # Label used to access the service container
@@ -21,13 +21,15 @@ jobs:
         # Config for postgres
         env:
           ASPNETCORE_ENVIRONMENT: all-features
-          ApplicationHostBaseUrl: http://reference-bookingsystem
+          ApplicationHostBaseUrl: http://localhost:5000
         # Set health checks to wait until postgres has started
         options: >-
           --health-cmd "curl -f http://localhost/OpenActive"
           --health-interval 10s
           --health-timeout 5s
           --health-retries 5
+        ports:
+          - 80:5000
 
       # Label used to access the service container
       # reference-bookingsystem-identity:
@@ -50,6 +52,10 @@ jobs:
         with:
           repository: openactive/openactive-test-suite
           path: tests
+      - name: Setup Node.js 14.x
+        uses: actions/setup-node@v1
+        with:
+          node-version: 14.x
       - name: Install OpenActive Test Suite
         run: npm install
         working-directory: tests
@@ -58,7 +64,7 @@ jobs:
         env:
           FORCE_COLOR: 1
           NODE_CONFIG: |
-            {"broker": {"outputPath": "../../output/", "datasetSiteUrl": "http://reference-bookingsystem/openactive"}, "integrationTests": { "outputPath": "../../output/", "useRandomOpportunities": true }}
+            {"broker": {"outputPath": "../../output/", "datasetSiteUrl": "http://localhost:5000/openactive"}, "integrationTests": { "outputPath": "../../output/", "useRandomOpportunities": true }}
           NODE_ENV: .example.all-features
           NODE_APP_INSTANCE: ci
         working-directory: tests

From c354f2c838c594cbd9b7c23f6316dbbc73922423 Mon Sep 17 00:00:00 2001
From: nickevansuk <2616208+nickevansuk@users.noreply.github.com>
Date: Fri, 26 May 2023 17:58:33 +0100
Subject: [PATCH 18/89] Fix

---
 .github/workflows/docker-test.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-test.yaml b/.github/workflows/docker-test.yaml
index c7bda55b..321b3120 100644
--- a/.github/workflows/docker-test.yaml
+++ b/.github/workflows/docker-test.yaml
@@ -20,7 +20,7 @@ jobs:
         image: ghcr.io/openactive/reference.bookingsystem:latest # ${{ github.event.package.package_version.version }}
         # Config for postgres
         env:
-          ASPNETCORE_ENVIRONMENT: all-features
+          ASPNETCORE_ENVIRONMENT: no-auth
           ApplicationHostBaseUrl: http://localhost:5000
         # Set health checks to wait until postgres has started
         options: >-
@@ -29,7 +29,7 @@ jobs:
           --health-timeout 5s
           --health-retries 5
         ports:
-          - 80:5000
+          - 5000:80
 
       # Label used to access the service container
       # reference-bookingsystem-identity:

From 7bd43e09239def4678638ddb606295ab525230f0 Mon Sep 17 00:00:00 2001
From: nickevansuk <2616208+nickevansuk@users.noreply.github.com>
Date: Tue, 30 May 2023 19:05:39 +0100
Subject: [PATCH 19/89] Fixes

---
 .github/workflows/docker-test.yaml | 26 +++++++-------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/docker-test.yaml b/.github/workflows/docker-test.yaml
index 321b3120..12af17cd 100644
--- a/.github/workflows/docker-test.yaml
+++ b/.github/workflows/docker-test.yaml
@@ -11,7 +11,7 @@ jobs:
     # Only run after 'reference.bookingsystem' is published 
     # if: ${{ github.event.package.name == 'reference.bookingsystem' }}
     runs-on: ubuntu-latest
-    # container: node:14.19.1
+    container: ghcr.io/openactive/test-suite:pr-539
     
     services:
       # Label used to access the service container
@@ -21,7 +21,7 @@ jobs:
         # Config for postgres
         env:
           ASPNETCORE_ENVIRONMENT: no-auth
-          ApplicationHostBaseUrl: http://localhost:5000
+          ApplicationHostBaseUrl: http://reference-bookingsystem
         # Set health checks to wait until postgres has started
         options: >-
           --health-cmd "curl -f http://localhost/OpenActive"
@@ -29,7 +29,7 @@ jobs:
           --health-timeout 5s
           --health-retries 5
         ports:
-          - 5000:80
+          - 80:80
 
       # Label used to access the service container
       # reference-bookingsystem-identity:
@@ -47,30 +47,18 @@ jobs:
       #     --health-retries 5
 
     steps:
-      - name: Checkout OpenActive Test Suite
-        uses: actions/checkout@v3
-        with:
-          repository: openactive/openactive-test-suite
-          path: tests
-      - name: Setup Node.js 14.x
-        uses: actions/setup-node@v1
-        with:
-          node-version: 14.x
-      - name: Install OpenActive Test Suite
-        run: npm install
-        working-directory: tests
       - name: Run OpenActive Integration Tests
         run: npm start
         env:
           FORCE_COLOR: 1
           NODE_CONFIG: |
-            {"broker": {"outputPath": "../../output/", "datasetSiteUrl": "http://localhost:5000/openactive"}, "integrationTests": { "outputPath": "../../output/", "useRandomOpportunities": true }}
-          NODE_ENV: .example.all-features
+            {"broker": {"outputPath": "../../output/", "datasetSiteUrl": "http://reference-bookingsystem/openactive"}, "integrationTests": { "outputPath": "../../output/", "useRandomOpportunities": true }, "sellers": {"primary": {  "@id": "http://reference-bookingsystem/api/identifiers/sellers/1","authentication": {"requestHeaders": {"X-OpenActive-Test-Seller-Id": "http://reference-bookingsystem/api/identifiers/sellers/1"}}},"secondary": {  "@id": "http://reference-bookingsystem/api/identifiers/sellers/2","authentication": {"requestHeaders": {"X-OpenActive-Test-Seller-Id": "http://reference-bookingsystem/api/identifiers/sellers/2"}}}}}
+          NODE_ENV: .example.no-auth
           NODE_APP_INSTANCE: ci
-        working-directory: tests
+        working-directory: openactive-test-suite # Included in the docker image
       - name: Upload test output as artifact
         uses: actions/upload-artifact@v2
         if: ${{ success() || failure() }}
         with:
           name: docker-test
-          path: ./tests/output/
+          path: ./openactive-test-suite/output/

From 34c1cb51de3b4e4afc8e27e0aed7f7ef2b946ef6 Mon Sep 17 00:00:00 2001
From: nickevansuk <2616208+nickevansuk@users.noreply.github.com>
Date: Tue, 30 May 2023 19:11:05 +0100
Subject: [PATCH 20/89] Fix path

---
 .github/workflows/docker-test.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-test.yaml b/.github/workflows/docker-test.yaml
index 12af17cd..d4d9cdcc 100644
--- a/.github/workflows/docker-test.yaml
+++ b/.github/workflows/docker-test.yaml
@@ -55,10 +55,10 @@ jobs:
             {"broker": {"outputPath": "../../output/", "datasetSiteUrl": "http://reference-bookingsystem/openactive"}, "integrationTests": { "outputPath": "../../output/", "useRandomOpportunities": true }, "sellers": {"primary": {  "@id": "http://reference-bookingsystem/api/identifiers/sellers/1","authentication": {"requestHeaders": {"X-OpenActive-Test-Seller-Id": "http://reference-bookingsystem/api/identifiers/sellers/1"}}},"secondary": {  "@id": "http://reference-bookingsystem/api/identifiers/sellers/2","authentication": {"requestHeaders": {"X-OpenActive-Test-Seller-Id": "http://reference-bookingsystem/api/identifiers/sellers/2"}}}}}
           NODE_ENV: .example.no-auth
           NODE_APP_INSTANCE: ci
-        working-directory: openactive-test-suite # Included in the docker image
+        working-directory: /openactive-test-suite # Included in the docker image
       - name: Upload test output as artifact
         uses: actions/upload-artifact@v2
         if: ${{ success() || failure() }}
         with:
           name: docker-test
-          path: ./openactive-test-suite/output/
+          path: /openactive-test-suite/output/

From f2c6ced8617790c971a9bdb2c17bf835843cfdbd Mon Sep 17 00:00:00 2001
From: nickevansuk <2616208+nickevansuk@users.noreply.github.com>
Date: Tue, 30 May 2023 19:18:15 +0100
Subject: [PATCH 21/89] Remove working dir

---
 .github/workflows/docker-test.yaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/docker-test.yaml b/.github/workflows/docker-test.yaml
index d4d9cdcc..0b14b207 100644
--- a/.github/workflows/docker-test.yaml
+++ b/.github/workflows/docker-test.yaml
@@ -55,10 +55,9 @@ jobs:
             {"broker": {"outputPath": "../../output/", "datasetSiteUrl": "http://reference-bookingsystem/openactive"}, "integrationTests": { "outputPath": "../../output/", "useRandomOpportunities": true }, "sellers": {"primary": {  "@id": "http://reference-bookingsystem/api/identifiers/sellers/1","authentication": {"requestHeaders": {"X-OpenActive-Test-Seller-Id": "http://reference-bookingsystem/api/identifiers/sellers/1"}}},"secondary": {  "@id": "http://reference-bookingsystem/api/identifiers/sellers/2","authentication": {"requestHeaders": {"X-OpenActive-Test-Seller-Id": "http://reference-bookingsystem/api/identifiers/sellers/2"}}}}}
           NODE_ENV: .example.no-auth
           NODE_APP_INSTANCE: ci
-        working-directory: /openactive-test-suite # Included in the docker image
       - name: Upload test output as artifact
         uses: actions/upload-artifact@v2
         if: ${{ success() || failure() }}
         with:
           name: docker-test
-          path: /openactive-test-suite/output/
+          path: ./output/

From 31a000693fc263455765918219327585fb965657 Mon Sep 17 00:00:00 2001
From: nickevansuk <2616208+nickevansuk@users.noreply.github.com>
Date: Tue, 30 May 2023 20:17:58 +0100
Subject: [PATCH 22/89] Add docker action

---
 .github/workflows/docker-test.yaml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/docker-test.yaml b/.github/workflows/docker-test.yaml
index 0b14b207..d7e8c050 100644
--- a/.github/workflows/docker-test.yaml
+++ b/.github/workflows/docker-test.yaml
@@ -11,7 +11,7 @@ jobs:
     # Only run after 'reference.bookingsystem' is published 
     # if: ${{ github.event.package.name == 'reference.bookingsystem' }}
     runs-on: ubuntu-latest
-    container: ghcr.io/openactive/test-suite:pr-539
+    container: node:14.17.0
     
     services:
       # Label used to access the service container
@@ -47,10 +47,9 @@ jobs:
       #     --health-retries 5
 
     steps:
-      - name: Run OpenActive Integration Tests
-        run: npm start
-        env:
-          FORCE_COLOR: 1
+      - name: Run OpenActive Test Suite
+        uses: openactive/openactive-test-suite@77b235dc4662fb915ef66dd6cc0f8f47d723504d
+        with:
           NODE_CONFIG: |
             {"broker": {"outputPath": "../../output/", "datasetSiteUrl": "http://reference-bookingsystem/openactive"}, "integrationTests": { "outputPath": "../../output/", "useRandomOpportunities": true }, "sellers": {"primary": {  "@id": "http://reference-bookingsystem/api/identifiers/sellers/1","authentication": {"requestHeaders": {"X-OpenActive-Test-Seller-Id": "http://reference-bookingsystem/api/identifiers/sellers/1"}}},"secondary": {  "@id": "http://reference-bookingsystem/api/identifiers/sellers/2","authentication": {"requestHeaders": {"X-OpenActive-Test-Seller-Id": "http://reference-bookingsystem/api/identifiers/sellers/2"}}}}}
           NODE_ENV: .example.no-auth

From 880aec7db9d6b02596948c248281f50649f98c5b Mon Sep 17 00:00:00 2001
From: nickevansuk <2616208+nickevansuk@users.noreply.github.com>
Date: Tue, 30 May 2023 20:48:36 +0100
Subject: [PATCH 23/89] Fix

---
 .github/workflows/docker-test.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-test.yaml b/.github/workflows/docker-test.yaml
index d7e8c050..1920704e 100644
--- a/.github/workflows/docker-test.yaml
+++ b/.github/workflows/docker-test.yaml
@@ -48,10 +48,10 @@ jobs:
 
     steps:
       - name: Run OpenActive Test Suite
-        uses: openactive/openactive-test-suite@77b235dc4662fb915ef66dd6cc0f8f47d723504d
+        uses: openactive/openactive-test-suite@9acf8cd468c51004a6f143e0bb57eb63fab275f2
         with:
           NODE_CONFIG: |
-            {"broker": {"outputPath": "../../output/", "datasetSiteUrl": "http://reference-bookingsystem/openactive"}, "integrationTests": { "outputPath": "../../output/", "useRandomOpportunities": true }, "sellers": {"primary": {  "@id": "http://reference-bookingsystem/api/identifiers/sellers/1","authentication": {"requestHeaders": {"X-OpenActive-Test-Seller-Id": "http://reference-bookingsystem/api/identifiers/sellers/1"}}},"secondary": {  "@id": "http://reference-bookingsystem/api/identifiers/sellers/2","authentication": {"requestHeaders": {"X-OpenActive-Test-Seller-Id": "http://reference-bookingsystem/api/identifiers/sellers/2"}}}}}
+            {"broker": {"outputPath": "/github/workspace/output/", "datasetSiteUrl": "http://reference-bookingsystem/openactive"}, "integrationTests": { "outputPath": "/github/workspace/output/", "useRandomOpportunities": true }, "sellers": {"primary": {  "@id": "http://reference-bookingsystem/api/identifiers/sellers/1","authentication": {"requestHeaders": {"X-OpenActive-Test-Seller-Id": "http://reference-bookingsystem/api/identifiers/sellers/1"}}},"secondary": {  "@id": "http://reference-bookingsystem/api/identifiers/sellers/2","authentication": {"requestHeaders": {"X-OpenActive-Test-Seller-Id": "http://reference-bookingsystem/api/identifiers/sellers/2"}}}}}
           NODE_ENV: .example.no-auth
           NODE_APP_INSTANCE: ci
       - name: Upload test output as artifact

From a0250833dc01df3ff58dadcb3500b4505707334f Mon Sep 17 00:00:00 2001
From: nickevansuk <2616208+nickevansuk@users.noreply.github.com>
Date: Tue, 30 May 2023 20:54:34 +0100
Subject: [PATCH 24/89] Fix

---
 .github/workflows/docker-test.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-test.yaml b/.github/workflows/docker-test.yaml
index 1920704e..6f588f91 100644
--- a/.github/workflows/docker-test.yaml
+++ b/.github/workflows/docker-test.yaml
@@ -48,7 +48,7 @@ jobs:
 
     steps:
       - name: Run OpenActive Test Suite
-        uses: openactive/openactive-test-suite@9acf8cd468c51004a6f143e0bb57eb63fab275f2
+        uses: openactive/openactive-test-suite@02808909b9293a6383664e1ff301537339f297bf
         with:
           NODE_CONFIG: |
             {"broker": {"outputPath": "/github/workspace/output/", "datasetSiteUrl": "http://reference-bookingsystem/openactive"}, "integrationTests": { "outputPath": "/github/workspace/output/", "useRandomOpportunities": true }, "sellers": {"primary": {  "@id": "http://reference-bookingsystem/api/identifiers/sellers/1","authentication": {"requestHeaders": {"X-OpenActive-Test-Seller-Id": "http://reference-bookingsystem/api/identifiers/sellers/1"}}},"secondary": {  "@id": "http://reference-bookingsystem/api/identifiers/sellers/2","authentication": {"requestHeaders": {"X-OpenActive-Test-Seller-Id": "http://reference-bookingsystem/api/identifiers/sellers/2"}}}}}

From 18835dac2009b42e3f60c1ec692758de39af77c5 Mon Sep 17 00:00:00 2001
From: nickevansuk <2616208+nickevansuk@users.noreply.github.com>
Date: Tue, 30 May 2023 21:11:39 +0100
Subject: [PATCH 25/89] Fix

---
 .github/workflows/docker-test.yaml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/docker-test.yaml b/.github/workflows/docker-test.yaml
index 6f588f91..c09516c4 100644
--- a/.github/workflows/docker-test.yaml
+++ b/.github/workflows/docker-test.yaml
@@ -15,13 +15,13 @@ jobs:
     
     services:
       # Label used to access the service container
-      reference-bookingsystem:
+      reference.bookingsystem:
         # Docker Hub image
-        image: ghcr.io/openactive/reference.bookingsystem:latest # ${{ github.event.package.package_version.version }}
+        image: ghcr.io/openactive/reference-bookingsystem:latest # ${{ github.event.package.package_version.version }}
         # Config for postgres
         env:
           ASPNETCORE_ENVIRONMENT: no-auth
-          ApplicationHostBaseUrl: http://reference-bookingsystem
+          ApplicationHostBaseUrl: http://reference.bookingsystem
         # Set health checks to wait until postgres has started
         options: >-
           --health-cmd "curl -f http://localhost/OpenActive"
@@ -32,13 +32,13 @@ jobs:
           - 80:80
 
       # Label used to access the service container
-      # reference-bookingsystem-identity:
+      # reference.bookingsystem-identity:
       #   # Docker Hub image
-      #   image: ghcr.io/openactive/reference.bookingsystem.identity:latest # ${{ github.event.package.package_version.version }}
+      #   image: ghcr.io/openactive/reference-bookingsystem.identity:latest # ${{ github.event.package.package_version.version }}
       #   # Config for postgres
       #   env:
       #     ASPNETCORE_ENVIRONMENT: all-features
-      #     ApplicationHostBaseUrl: https://reference-bookingsystem-identity
+      #     ApplicationHostBaseUrl: https://identity.reference.bookingsystem
       #   # Set health checks to wait until postgres has started
       #   options: >-
       #     --health-cmd "curl -f http://localhost/.well-known/openid-configuration"
@@ -51,7 +51,7 @@ jobs:
         uses: openactive/openactive-test-suite@02808909b9293a6383664e1ff301537339f297bf
         with:
           NODE_CONFIG: |
-            {"broker": {"outputPath": "/github/workspace/output/", "datasetSiteUrl": "http://reference-bookingsystem/openactive"}, "integrationTests": { "outputPath": "/github/workspace/output/", "useRandomOpportunities": true }, "sellers": {"primary": {  "@id": "http://reference-bookingsystem/api/identifiers/sellers/1","authentication": {"requestHeaders": {"X-OpenActive-Test-Seller-Id": "http://reference-bookingsystem/api/identifiers/sellers/1"}}},"secondary": {  "@id": "http://reference-bookingsystem/api/identifiers/sellers/2","authentication": {"requestHeaders": {"X-OpenActive-Test-Seller-Id": "http://reference-bookingsystem/api/identifiers/sellers/2"}}}}}
+            {"broker": {"outputPath": "/github/workspace/output/", "datasetSiteUrl": "http://reference.bookingsystem/openactive"}, "integrationTests": { "outputPath": "/github/workspace/output/", "useRandomOpportunities": true }, "sellers": {"primary": {  "@id": "http://reference.bookingsystem/api/identifiers/sellers/1","authentication": {"requestHeaders": {"X-OpenActive-Test-Seller-Id": "http://reference.bookingsystem/api/identifiers/sellers/1"}}},"secondary": {  "@id": "http://reference.bookingsystem/api/identifiers/sellers/2","authentication": {"requestHeaders": {"X-OpenActive-Test-Seller-Id": "http://reference.bookingsystem/api/identifiers/sellers/2"}}}}}
           NODE_ENV: .example.no-auth
           NODE_APP_INSTANCE: ci
       - name: Upload test output as artifact

From 93a45dd3cc246a152ea13af31b1e1da6900c7bf7 Mon Sep 17 00:00:00 2001
From: nickevansuk <2616208+nickevansuk@users.noreply.github.com>
Date: Tue, 30 May 2023 21:18:25 +0100
Subject: [PATCH 26/89] Fix

---
 .github/workflows/docker-test.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-test.yaml b/.github/workflows/docker-test.yaml
index c09516c4..bfaa010c 100644
--- a/.github/workflows/docker-test.yaml
+++ b/.github/workflows/docker-test.yaml
@@ -17,7 +17,7 @@ jobs:
       # Label used to access the service container
       reference.bookingsystem:
         # Docker Hub image
-        image: ghcr.io/openactive/reference-bookingsystem:latest # ${{ github.event.package.package_version.version }}
+        image: ghcr.io/openactive/reference.bookingsystem:latest # ${{ github.event.package.package_version.version }}
         # Config for postgres
         env:
           ASPNETCORE_ENVIRONMENT: no-auth
@@ -34,7 +34,7 @@ jobs:
       # Label used to access the service container
       # reference.bookingsystem-identity:
       #   # Docker Hub image
-      #   image: ghcr.io/openactive/reference-bookingsystem.identity:latest # ${{ github.event.package.package_version.version }}
+      #   image: ghcr.io/openactive/reference.bookingsystem.identity:latest # ${{ github.event.package.package_version.version }}
       #   # Config for postgres
       #   env:
       #     ASPNETCORE_ENVIRONMENT: all-features

From bbcb19dd54eea4930e421b6fe2dcdf936325dfb5 Mon Sep 17 00:00:00 2001
From: nickevansuk <2616208+nickevansuk@users.noreply.github.com>
Date: Tue, 30 May 2023 21:23:55 +0100
Subject: [PATCH 27/89] Faster

---
 .github/workflows/docker-test.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/docker-test.yaml b/.github/workflows/docker-test.yaml
index bfaa010c..2d525976 100644
--- a/.github/workflows/docker-test.yaml
+++ b/.github/workflows/docker-test.yaml
@@ -32,13 +32,13 @@ jobs:
           - 80:80
 
       # Label used to access the service container
-      # reference.bookingsystem-identity:
+      # reference.bookingsystem.identity:
       #   # Docker Hub image
       #   image: ghcr.io/openactive/reference.bookingsystem.identity:latest # ${{ github.event.package.package_version.version }}
       #   # Config for postgres
       #   env:
       #     ASPNETCORE_ENVIRONMENT: all-features
-      #     ApplicationHostBaseUrl: https://identity.reference.bookingsystem
+      #     ApplicationHostBaseUrl: https://reference.bookingsystem.identity
       #   # Set health checks to wait until postgres has started
       #   options: >-
       #     --health-cmd "curl -f http://localhost/.well-known/openid-configuration"
@@ -48,7 +48,7 @@ jobs:
 
     steps:
       - name: Run OpenActive Test Suite
-        uses: openactive/openactive-test-suite@02808909b9293a6383664e1ff301537339f297bf
+        uses: openactive/openactive-test-suite@c9d08389eecdfd1637a62dfb28c4d8b73a4297f2
         with:
           NODE_CONFIG: |
             {"broker": {"outputPath": "/github/workspace/output/", "datasetSiteUrl": "http://reference.bookingsystem/openactive"}, "integrationTests": { "outputPath": "/github/workspace/output/", "useRandomOpportunities": true }, "sellers": {"primary": {  "@id": "http://reference.bookingsystem/api/identifiers/sellers/1","authentication": {"requestHeaders": {"X-OpenActive-Test-Seller-Id": "http://reference.bookingsystem/api/identifiers/sellers/1"}}},"secondary": {  "@id": "http://reference.bookingsystem/api/identifiers/sellers/2","authentication": {"requestHeaders": {"X-OpenActive-Test-Seller-Id": "http://reference.bookingsystem/api/identifiers/sellers/2"}}}}}

From 3899e975aa66d02b8927e9ca1b00c22388c5a3f5 Mon Sep 17 00:00:00 2001
From: nickevansuk <2616208+nickevansuk@users.noreply.github.com>
Date: Tue, 30 May 2023 21:32:23 +0100
Subject: [PATCH 28/89] Fix

---
 .github/workflows/docker-test.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-test.yaml b/.github/workflows/docker-test.yaml
index 2d525976..722be02e 100644
--- a/.github/workflows/docker-test.yaml
+++ b/.github/workflows/docker-test.yaml
@@ -48,7 +48,7 @@ jobs:
 
     steps:
       - name: Run OpenActive Test Suite
-        uses: openactive/openactive-test-suite@c9d08389eecdfd1637a62dfb28c4d8b73a4297f2
+        uses: openactive/openactive-test-suite@09f3bc431d000029d823d14ca22def7dda87f903
         with:
           NODE_CONFIG: |
             {"broker": {"outputPath": "/github/workspace/output/", "datasetSiteUrl": "http://reference.bookingsystem/openactive"}, "integrationTests": { "outputPath": "/github/workspace/output/", "useRandomOpportunities": true }, "sellers": {"primary": {  "@id": "http://reference.bookingsystem/api/identifiers/sellers/1","authentication": {"requestHeaders": {"X-OpenActive-Test-Seller-Id": "http://reference.bookingsystem/api/identifiers/sellers/1"}}},"secondary": {  "@id": "http://reference.bookingsystem/api/identifiers/sellers/2","authentication": {"requestHeaders": {"X-OpenActive-Test-Seller-Id": "http://reference.bookingsystem/api/identifiers/sellers/2"}}}}}

From 976747451a429941d72562dbbd68e84158afe7e1 Mon Sep 17 00:00:00 2001
From: nickevansuk <2616208+nickevansuk@users.noreply.github.com>
Date: Tue, 30 May 2023 21:53:36 +0100
Subject: [PATCH 29/89] Updated to use latest

---
 .github/workflows/docker-test.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-test.yaml b/.github/workflows/docker-test.yaml
index 722be02e..f4c3a780 100644
--- a/.github/workflows/docker-test.yaml
+++ b/.github/workflows/docker-test.yaml
@@ -48,7 +48,7 @@ jobs:
 
     steps:
       - name: Run OpenActive Test Suite
-        uses: openactive/openactive-test-suite@09f3bc431d000029d823d14ca22def7dda87f903
+        uses: openactive/openactive-test-suite@182398a0980bc544ce79c6d018d52bc723fe8d04
         with:
           NODE_CONFIG: |
             {"broker": {"outputPath": "/github/workspace/output/", "datasetSiteUrl": "http://reference.bookingsystem/openactive"}, "integrationTests": { "outputPath": "/github/workspace/output/", "useRandomOpportunities": true }, "sellers": {"primary": {  "@id": "http://reference.bookingsystem/api/identifiers/sellers/1","authentication": {"requestHeaders": {"X-OpenActive-Test-Seller-Id": "http://reference.bookingsystem/api/identifiers/sellers/1"}}},"secondary": {  "@id": "http://reference.bookingsystem/api/identifiers/sellers/2","authentication": {"requestHeaders": {"X-OpenActive-Test-Seller-Id": "http://reference.bookingsystem/api/identifiers/sellers/2"}}}}}

From 5d4706c02e15907ed0f9f9b222e364928171373f Mon Sep 17 00:00:00 2001
From: nickevansuk <2616208+nickevansuk@users.noreply.github.com>
Date: Tue, 30 May 2023 23:10:30 +0100
Subject: [PATCH 30/89] Update

---
 .github/workflows/docker-test.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-test.yaml b/.github/workflows/docker-test.yaml
index f4c3a780..1ca58324 100644
--- a/.github/workflows/docker-test.yaml
+++ b/.github/workflows/docker-test.yaml
@@ -48,7 +48,7 @@ jobs:
 
     steps:
       - name: Run OpenActive Test Suite
-        uses: openactive/openactive-test-suite@182398a0980bc544ce79c6d018d52bc723fe8d04
+        uses: openactive/openactive-test-suite@d7cbdac7f03ce75f282927fe67c9a375f1e440a8
         with:
           NODE_CONFIG: |
             {"broker": {"outputPath": "/github/workspace/output/", "datasetSiteUrl": "http://reference.bookingsystem/openactive"}, "integrationTests": { "outputPath": "/github/workspace/output/", "useRandomOpportunities": true }, "sellers": {"primary": {  "@id": "http://reference.bookingsystem/api/identifiers/sellers/1","authentication": {"requestHeaders": {"X-OpenActive-Test-Seller-Id": "http://reference.bookingsystem/api/identifiers/sellers/1"}}},"secondary": {  "@id": "http://reference.bookingsystem/api/identifiers/sellers/2","authentication": {"requestHeaders": {"X-OpenActive-Test-Seller-Id": "http://reference.bookingsystem/api/identifiers/sellers/2"}}}}}

From fe3825585cba09b12929801954a5ff046662f255 Mon Sep 17 00:00:00 2001
From: nickevansuk <2616208+nickevansuk@users.noreply.github.com>
Date: Tue, 6 Jun 2023 18:45:13 +0100
Subject: [PATCH 31/89] Add upterm

---
 .github/workflows/docker-test.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/docker-test.yaml b/.github/workflows/docker-test.yaml
index 1ca58324..a8603f91 100644
--- a/.github/workflows/docker-test.yaml
+++ b/.github/workflows/docker-test.yaml
@@ -47,6 +47,8 @@ jobs:
       #     --health-retries 5
 
     steps:
+      - name: Setup upterm session
+        uses: lhotari/action-upterm@v1
       - name: Run OpenActive Test Suite
         uses: openactive/openactive-test-suite@d7cbdac7f03ce75f282927fe67c9a375f1e440a8
         with:

From e113a6755bfba640fefa097ac193241ae36dfd09 Mon Sep 17 00:00:00 2001
From: nickevansuk <2616208+nickevansuk@users.noreply.github.com>
Date: Tue, 6 Jun 2023 18:53:42 +0100
Subject: [PATCH 32/89] Again

---
 .github/workflows/docker-test.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/docker-test.yaml b/.github/workflows/docker-test.yaml
index a8603f91..bcd91a3a 100644
--- a/.github/workflows/docker-test.yaml
+++ b/.github/workflows/docker-test.yaml
@@ -11,7 +11,6 @@ jobs:
     # Only run after 'reference.bookingsystem' is published 
     # if: ${{ github.event.package.name == 'reference.bookingsystem' }}
     runs-on: ubuntu-latest
-    container: node:14.17.0
     
     services:
       # Label used to access the service container

From 6fcb7a4cfbaddcbc44ef2c552da7c1e3ce875511 Mon Sep 17 00:00:00 2001
From: nickevansuk <2616208+nickevansuk@users.noreply.github.com>
Date: Tue, 6 Jun 2023 18:54:26 +0100
Subject: [PATCH 33/89] Fix

---
 .github/workflows/docker-test.yaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-test.yaml b/.github/workflows/docker-test.yaml
index bcd91a3a..7a813a92 100644
--- a/.github/workflows/docker-test.yaml
+++ b/.github/workflows/docker-test.yaml
@@ -46,8 +46,6 @@ jobs:
       #     --health-retries 5
 
     steps:
-      - name: Setup upterm session
-        uses: lhotari/action-upterm@v1
       - name: Run OpenActive Test Suite
         uses: openactive/openactive-test-suite@d7cbdac7f03ce75f282927fe67c9a375f1e440a8
         with:
@@ -55,6 +53,9 @@ jobs:
             {"broker": {"outputPath": "/github/workspace/output/", "datasetSiteUrl": "http://reference.bookingsystem/openactive"}, "integrationTests": { "outputPath": "/github/workspace/output/", "useRandomOpportunities": true }, "sellers": {"primary": {  "@id": "http://reference.bookingsystem/api/identifiers/sellers/1","authentication": {"requestHeaders": {"X-OpenActive-Test-Seller-Id": "http://reference.bookingsystem/api/identifiers/sellers/1"}}},"secondary": {  "@id": "http://reference.bookingsystem/api/identifiers/sellers/2","authentication": {"requestHeaders": {"X-OpenActive-Test-Seller-Id": "http://reference.bookingsystem/api/identifiers/sellers/2"}}}}}
           NODE_ENV: .example.no-auth
           NODE_APP_INSTANCE: ci
+      - name: Setup upterm session
+        if: ${{ success() || failure() }}
+        uses: lhotari/action-upterm@v1
       - name: Upload test output as artifact
         uses: actions/upload-artifact@v2
         if: ${{ success() || failure() }}

From 6529855fc9ce55135205f2a52fe5ebfb7d97e9fd Mon Sep 17 00:00:00 2001
From: nickevansuk <2616208+nickevansuk@users.noreply.github.com>
Date: Tue, 6 Jun 2023 18:57:37 +0100
Subject: [PATCH 34/89] Revert

---
 .github/workflows/docker-test.yaml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/docker-test.yaml b/.github/workflows/docker-test.yaml
index 7a813a92..1ca58324 100644
--- a/.github/workflows/docker-test.yaml
+++ b/.github/workflows/docker-test.yaml
@@ -11,6 +11,7 @@ jobs:
     # Only run after 'reference.bookingsystem' is published 
     # if: ${{ github.event.package.name == 'reference.bookingsystem' }}
     runs-on: ubuntu-latest
+    container: node:14.17.0
     
     services:
       # Label used to access the service container
@@ -53,9 +54,6 @@ jobs:
             {"broker": {"outputPath": "/github/workspace/output/", "datasetSiteUrl": "http://reference.bookingsystem/openactive"}, "integrationTests": { "outputPath": "/github/workspace/output/", "useRandomOpportunities": true }, "sellers": {"primary": {  "@id": "http://reference.bookingsystem/api/identifiers/sellers/1","authentication": {"requestHeaders": {"X-OpenActive-Test-Seller-Id": "http://reference.bookingsystem/api/identifiers/sellers/1"}}},"secondary": {  "@id": "http://reference.bookingsystem/api/identifiers/sellers/2","authentication": {"requestHeaders": {"X-OpenActive-Test-Seller-Id": "http://reference.bookingsystem/api/identifiers/sellers/2"}}}}}
           NODE_ENV: .example.no-auth
           NODE_APP_INSTANCE: ci
-      - name: Setup upterm session
-        if: ${{ success() || failure() }}
-        uses: lhotari/action-upterm@v1
       - name: Upload test output as artifact
         uses: actions/upload-artifact@v2
         if: ${{ success() || failure() }}

From abccefce7320942c312d487c8b21122b20382087 Mon Sep 17 00:00:00 2001
From: nickevansuk <2616208+nickevansuk@users.noreply.github.com>
Date: Tue, 6 Jun 2023 21:41:30 +0100
Subject: [PATCH 35/89] Another test

---
 .github/workflows/docker-test-2.yaml | 58 ++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 .github/workflows/docker-test-2.yaml

diff --git a/.github/workflows/docker-test-2.yaml b/.github/workflows/docker-test-2.yaml
new file mode 100644
index 00000000..e54d0a81
--- /dev/null
+++ b/.github/workflows/docker-test-2.yaml
@@ -0,0 +1,58 @@
+name: Test using Docker for CI
+on:
+  push:
+    branches: [ feature/docker-image ]
+
+jobs:
+  core:
+    needs:
+    runs-on: ubuntu-latest
+    container:
+      image: ubuntu
+      options: --name refimpl.api
+    strategy:
+      fail-fast: false
+      matrix:
+        mode: ['random']
+        profile: ['all-features']
+    steps:
+    - name: Checkout OpenActive.Server.NET
+      uses: actions/checkout@v2
+      with:
+        path: server
+    - name: Setup .NET Core SDK 3.1.419
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 3.1.419
+    - name: Install OpenActive.Server.NET dependencies
+      if: ${{ matrix.profile != 'no-auth' && matrix.profile != 'single-seller' }}
+      run: dotnet restore ./server/
+    - name: Build .NET Core Authentication Authority Reference Implementation
+      if: ${{ matrix.profile != 'no-auth' && matrix.profile != 'single-seller' }}
+      run: dotnet build ./server/Examples/BookingSystem.AspNetCore.IdentityServer/BookingSystem.AspNetCore.IdentityServer.csproj --configuration Release --no-restore
+    - name: Start .NET Core Authentication Authority Reference Implementation
+      if: ${{ matrix.profile != 'no-auth' && matrix.profile != 'single-seller' }}
+      run: |
+        dotnet run --no-launch-profile --project ./server/Examples/BookingSystem.AspNetCore.IdentityServer/BookingSystem.AspNetCore.IdentityServer.csproj --configuration Release --no-build &
+    - name: Build .NET Core Booking Server Reference Implementation
+      run: dotnet build ./server/Examples/BookingSystem.AspNetCore/BookingSystem.AspNetCore.csproj --configuration Release ${{ matrix.profile != 'no-auth' && matrix.profile != 'single-seller' && '--no-restore' || '' }}
+    - name: Start .NET Core Booking Server Reference Implementation
+      run: |
+        dotnet run --no-launch-profile --project ./server/Examples/BookingSystem.AspNetCore/BookingSystem.AspNetCore.csproj --configuration Release --no-build &
+      env:
+        ASPNETCORE_ENVIRONMENT: ${{ matrix.profile }}
+    
+    - name: Run OpenActive Test Suite
+      uses: openactive/openactive-test-suite@d7cbdac7f03ce75f282927fe67c9a375f1e440a8
+      with:
+        NODE_CONFIG: |
+          {"broker": {"outputPath": "/github/workspace/output/", "datasetSiteUrl": "http://refimpl.api/openactive"}, "integrationTests": { "outputPath": "/github/workspace/output/", "conformanceCertificatePath": "/github/workspace/conformance/examples/${{ matrix.profile }}/${{ matrix.mode }}/", "useRandomOpportunities": ${{ matrix.mode == 'random' }}, "conformanceCertificateId": "https://certificates.reference-implementation.openactive.io/examples/${{ matrix.profile }}/${{ matrix.mode }}/" }}
+        NODE_ENV: .example.${{ matrix.profile }}
+        NODE_APP_INSTANCE: ci
+
+    - name: Upload test output for ${{ matrix.mode }} mode as artifact
+      uses: actions/upload-artifact@v2
+      if: ${{ success() || failure() }}
+      with:
+        name: core.${{ matrix.mode }}.${{ matrix.profile }}
+        path: ./output/

From d963e3cd5d5e602e2d692fc176a3bce8a7ceef9f Mon Sep 17 00:00:00 2001
From: nickevansuk <2616208+nickevansuk@users.noreply.github.com>
Date: Tue, 6 Jun 2023 21:42:27 +0100
Subject: [PATCH 36/89] Fix

---
 .github/workflows/docker-test-2.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/docker-test-2.yaml b/.github/workflows/docker-test-2.yaml
index e54d0a81..f18b4a47 100644
--- a/.github/workflows/docker-test-2.yaml
+++ b/.github/workflows/docker-test-2.yaml
@@ -5,7 +5,6 @@ on:
 
 jobs:
   core:
-    needs:
     runs-on: ubuntu-latest
     container:
       image: ubuntu

From dde73567b71e5587792b3cd957260611f9eb1462 Mon Sep 17 00:00:00 2001
From: nickevansuk <2616208+nickevansuk@users.noreply.github.com>
Date: Tue, 6 Jun 2023 21:45:19 +0100
Subject: [PATCH 37/89] Test

---
 .github/workflows/docker-test-2.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-test-2.yaml b/.github/workflows/docker-test-2.yaml
index f18b4a47..8366852a 100644
--- a/.github/workflows/docker-test-2.yaml
+++ b/.github/workflows/docker-test-2.yaml
@@ -7,7 +7,7 @@ jobs:
   core:
     runs-on: ubuntu-latest
     container:
-      image: ubuntu
+      image: mcr.microsoft.com/dotnet/sdk:3.1
       options: --name refimpl.api
     strategy:
       fail-fast: false
@@ -45,7 +45,7 @@ jobs:
       uses: openactive/openactive-test-suite@d7cbdac7f03ce75f282927fe67c9a375f1e440a8
       with:
         NODE_CONFIG: |
-          {"broker": {"outputPath": "/github/workspace/output/", "datasetSiteUrl": "http://refimpl.api/openactive"}, "integrationTests": { "outputPath": "/github/workspace/output/", "conformanceCertificatePath": "/github/workspace/conformance/examples/${{ matrix.profile }}/${{ matrix.mode }}/", "useRandomOpportunities": ${{ matrix.mode == 'random' }}, "conformanceCertificateId": "https://certificates.reference-implementation.openactive.io/examples/${{ matrix.profile }}/${{ matrix.mode }}/" }}
+          {"broker": {"outputPath": "/github/workspace/output/", "datasetSiteUrl": "https://refimpl.api:5001/openactive"}, "integrationTests": { "outputPath": "/github/workspace/output/", "conformanceCertificatePath": "/github/workspace/conformance/examples/${{ matrix.profile }}/${{ matrix.mode }}/", "useRandomOpportunities": ${{ matrix.mode == 'random' }}, "conformanceCertificateId": "https://certificates.reference-implementation.openactive.io/examples/${{ matrix.profile }}/${{ matrix.mode }}/" }}
         NODE_ENV: .example.${{ matrix.profile }}
         NODE_APP_INSTANCE: ci
 

From 0e1914d28bb6c124e9f098c87901a24a0b3bc48f Mon Sep 17 00:00:00 2001
From: nickevansuk <2616208+nickevansuk@users.noreply.github.com>
Date: Tue, 6 Jun 2023 21:46:45 +0100
Subject: [PATCH 38/89] Fix

---
 .github/workflows/docker-test-2.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/docker-test-2.yaml b/.github/workflows/docker-test-2.yaml
index 8366852a..a6b4b28e 100644
--- a/.github/workflows/docker-test-2.yaml
+++ b/.github/workflows/docker-test-2.yaml
@@ -19,10 +19,6 @@ jobs:
       uses: actions/checkout@v2
       with:
         path: server
-    - name: Setup .NET Core SDK 3.1.419
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 3.1.419
     - name: Install OpenActive.Server.NET dependencies
       if: ${{ matrix.profile != 'no-auth' && matrix.profile != 'single-seller' }}
       run: dotnet restore ./server/

From c17d93a534b9a4e0ef48e5db1a68ca5f84367d3d Mon Sep 17 00:00:00 2001
From: nickevansuk <2616208+nickevansuk@users.noreply.github.com>
Date: Tue, 6 Jun 2023 21:48:50 +0100
Subject: [PATCH 39/89] Attempt 2

---
 .github/workflows/docker-test-2.yaml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/docker-test-2.yaml b/.github/workflows/docker-test-2.yaml
index a6b4b28e..0c540036 100644
--- a/.github/workflows/docker-test-2.yaml
+++ b/.github/workflows/docker-test-2.yaml
@@ -6,9 +6,6 @@ on:
 jobs:
   core:
     runs-on: ubuntu-latest
-    container:
-      image: mcr.microsoft.com/dotnet/sdk:3.1
-      options: --name refimpl.api
     strategy:
       fail-fast: false
       matrix:
@@ -19,6 +16,10 @@ jobs:
       uses: actions/checkout@v2
       with:
         path: server
+    - name: Setup .NET Core SDK 3.1.419
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 3.1.419
     - name: Install OpenActive.Server.NET dependencies
       if: ${{ matrix.profile != 'no-auth' && matrix.profile != 'single-seller' }}
       run: dotnet restore ./server/
@@ -41,7 +42,7 @@ jobs:
       uses: openactive/openactive-test-suite@d7cbdac7f03ce75f282927fe67c9a375f1e440a8
       with:
         NODE_CONFIG: |
-          {"broker": {"outputPath": "/github/workspace/output/", "datasetSiteUrl": "https://refimpl.api:5001/openactive"}, "integrationTests": { "outputPath": "/github/workspace/output/", "conformanceCertificatePath": "/github/workspace/conformance/examples/${{ matrix.profile }}/${{ matrix.mode }}/", "useRandomOpportunities": ${{ matrix.mode == 'random' }}, "conformanceCertificateId": "https://certificates.reference-implementation.openactive.io/examples/${{ matrix.profile }}/${{ matrix.mode }}/" }}
+          {"broker": {"outputPath": "/github/workspace/output/", "datasetSiteUrl": "https://host.docker.internal:5001/openactive"}, "integrationTests": { "outputPath": "/github/workspace/output/", "conformanceCertificatePath": "/github/workspace/conformance/examples/${{ matrix.profile }}/${{ matrix.mode }}/", "useRandomOpportunities": ${{ matrix.mode == 'random' }}, "conformanceCertificateId": "https://certificates.reference-implementation.openactive.io/examples/${{ matrix.profile }}/${{ matrix.mode }}/" }}
         NODE_ENV: .example.${{ matrix.profile }}
         NODE_APP_INSTANCE: ci
 

From eb5d35006b86e3e4b618f418509722fb2837c9b4 Mon Sep 17 00:00:00 2001
From: nickevansuk <2616208+nickevansuk@users.noreply.github.com>
Date: Tue, 6 Jun 2023 21:59:40 +0100
Subject: [PATCH 40/89] Revert

---
 .github/workflows/docker-test-2.yaml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docker-test-2.yaml b/.github/workflows/docker-test-2.yaml
index 0c540036..ea54a2de 100644
--- a/.github/workflows/docker-test-2.yaml
+++ b/.github/workflows/docker-test-2.yaml
@@ -6,6 +6,9 @@ on:
 jobs:
   core:
     runs-on: ubuntu-latest
+    container:
+      image: ubuntu
+      options: --name refimpl.api
     strategy:
       fail-fast: false
       matrix:
@@ -42,7 +45,7 @@ jobs:
       uses: openactive/openactive-test-suite@d7cbdac7f03ce75f282927fe67c9a375f1e440a8
       with:
         NODE_CONFIG: |
-          {"broker": {"outputPath": "/github/workspace/output/", "datasetSiteUrl": "https://host.docker.internal:5001/openactive"}, "integrationTests": { "outputPath": "/github/workspace/output/", "conformanceCertificatePath": "/github/workspace/conformance/examples/${{ matrix.profile }}/${{ matrix.mode }}/", "useRandomOpportunities": ${{ matrix.mode == 'random' }}, "conformanceCertificateId": "https://certificates.reference-implementation.openactive.io/examples/${{ matrix.profile }}/${{ matrix.mode }}/" }}
+          {"broker": {"outputPath": "/github/workspace/output/", "datasetSiteUrl": "https://refimpl.api:5001/openactive"}, "integrationTests": { "outputPath": "/github/workspace/output/", "conformanceCertificatePath": "/github/workspace/conformance/examples/${{ matrix.profile }}/${{ matrix.mode }}/", "useRandomOpportunities": ${{ matrix.mode == 'random' }}, "conformanceCertificateId": "https://certificates.reference-implementation.openactive.io/examples/${{ matrix.profile }}/${{ matrix.mode }}/" }}
         NODE_ENV: .example.${{ matrix.profile }}
         NODE_APP_INSTANCE: ci
 

From f4ce207c83a3d17fc5990e50e2813f62138c1ae6 Mon Sep 17 00:00:00 2001
From: nickevansuk <2616208+nickevansuk@users.noreply.github.com>
Date: Tue, 6 Jun 2023 22:01:07 +0100
Subject: [PATCH 41/89] Revert

---
 .github/workflows/docker-test-2.yaml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/docker-test-2.yaml b/.github/workflows/docker-test-2.yaml
index ea54a2de..4858b872 100644
--- a/.github/workflows/docker-test-2.yaml
+++ b/.github/workflows/docker-test-2.yaml
@@ -7,7 +7,7 @@ jobs:
   core:
     runs-on: ubuntu-latest
     container:
-      image: ubuntu
+      image: mcr.microsoft.com/dotnet/sdk:3.1
       options: --name refimpl.api
     strategy:
       fail-fast: false
@@ -19,10 +19,6 @@ jobs:
       uses: actions/checkout@v2
       with:
         path: server
-    - name: Setup .NET Core SDK 3.1.419
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 3.1.419
     - name: Install OpenActive.Server.NET dependencies
       if: ${{ matrix.profile != 'no-auth' && matrix.profile != 'single-seller' }}
       run: dotnet restore ./server/
@@ -54,4 +50,4 @@ jobs:
       if: ${{ success() || failure() }}
       with:
         name: core.${{ matrix.mode }}.${{ matrix.profile }}
-        path: ./output/
+        path: ./output/
\ No newline at end of file

From a0d83afb62d9db5cc92ab7290c95d07a3f9774fd Mon Sep 17 00:00:00 2001
From: nickevansuk <2616208+nickevansuk@users.noreply.github.com>
Date: Tue, 6 Jun 2023 22:01:49 +0100
Subject: [PATCH 42/89] Add ports

---
 .github/workflows/docker-test-2.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/docker-test-2.yaml b/.github/workflows/docker-test-2.yaml
index 4858b872..9f96ce55 100644
--- a/.github/workflows/docker-test-2.yaml
+++ b/.github/workflows/docker-test-2.yaml
@@ -9,6 +9,8 @@ jobs:
     container:
       image: mcr.microsoft.com/dotnet/sdk:3.1
       options: --name refimpl.api
+      ports:
+      - 5001
     strategy:
       fail-fast: false
       matrix:

From 05a8a908b8551bc8960903e39a20848e6cffb843 Mon Sep 17 00:00:00 2001
From: nickevansuk <2616208+nickevansuk@users.noreply.github.com>
Date: Wed, 14 Jun 2023 14:33:35 +0100
Subject: [PATCH 43/89] Debug mode

---
 .github/workflows/docker-test-2.yaml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/docker-test-2.yaml b/.github/workflows/docker-test-2.yaml
index 9f96ce55..02bbaa72 100644
--- a/.github/workflows/docker-test-2.yaml
+++ b/.github/workflows/docker-test-2.yaml
@@ -4,13 +4,11 @@ on:
     branches: [ feature/docker-image ]
 
 jobs:
-  core:
+  docker-test:
     runs-on: ubuntu-latest
     container:
       image: mcr.microsoft.com/dotnet/sdk:3.1
-      options: --name refimpl.api
-      ports:
-      - 5001
+      options: --network-alias refimpl.api
     strategy:
       fail-fast: false
       matrix:
@@ -21,6 +19,10 @@ jobs:
       uses: actions/checkout@v2
       with:
         path: server
+
+    - name: Setup tmate session
+      uses: mxschmitt/action-tmate@v3
+
     - name: Install OpenActive.Server.NET dependencies
       if: ${{ matrix.profile != 'no-auth' && matrix.profile != 'single-seller' }}
       run: dotnet restore ./server/

From 9c6617a368b9b1231be243e3e3277c3347488a93 Mon Sep 17 00:00:00 2001
From: nickevansuk <2616208+nickevansuk@users.noreply.github.com>
Date: Wed, 14 Jun 2023 14:46:31 +0100
Subject: [PATCH 44/89] More debug

---
 .github/workflows/docker-test-2.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/docker-test-2.yaml b/.github/workflows/docker-test-2.yaml
index 02bbaa72..a173f8ed 100644
--- a/.github/workflows/docker-test-2.yaml
+++ b/.github/workflows/docker-test-2.yaml
@@ -19,10 +19,6 @@ jobs:
       uses: actions/checkout@v2
       with:
         path: server
-
-    - name: Setup tmate session
-      uses: mxschmitt/action-tmate@v3
-
     - name: Install OpenActive.Server.NET dependencies
       if: ${{ matrix.profile != 'no-auth' && matrix.profile != 'single-seller' }}
       run: dotnet restore ./server/
@@ -49,6 +45,10 @@ jobs:
         NODE_ENV: .example.${{ matrix.profile }}
         NODE_APP_INSTANCE: ci
 
+    - name: Setup tmate session
+      uses: mxschmitt/action-tmate@v3
+      if: ${{ failure() }}
+
     - name: Upload test output for ${{ matrix.mode }} mode as artifact
       uses: actions/upload-artifact@v2
       if: ${{ success() || failure() }}

From f67e3d80ffb5a94feb597aaa76e4e18f3715e4e7 Mon Sep 17 00:00:00 2001
From: nickevansuk <2616208+nickevansuk@users.noreply.github.com>
Date: Wed, 14 Jun 2023 18:57:46 +0100
Subject: [PATCH 45/89] Rerun

---
 .github/workflows/docker-test-2.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/docker-test-2.yaml b/.github/workflows/docker-test-2.yaml
index a173f8ed..f28b88fd 100644
--- a/.github/workflows/docker-test-2.yaml
+++ b/.github/workflows/docker-test-2.yaml
@@ -45,6 +45,7 @@ jobs:
         NODE_ENV: .example.${{ matrix.profile }}
         NODE_APP_INSTANCE: ci
 
+
     - name: Setup tmate session
       uses: mxschmitt/action-tmate@v3
       if: ${{ failure() }}

From 9502704bbe1e7840d9e44860aa406e077241a0f2 Mon Sep 17 00:00:00 2001
From: nickevansuk <2616208+nickevansuk@users.noreply.github.com>
Date: Wed, 14 Jun 2023 19:11:38 +0100
Subject: [PATCH 46/89] Another test

---
 .github/workflows/docker-test-2.yaml | 1 -
 .github/workflows/docker-test.yaml   | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/docker-test-2.yaml b/.github/workflows/docker-test-2.yaml
index f28b88fd..a173f8ed 100644
--- a/.github/workflows/docker-test-2.yaml
+++ b/.github/workflows/docker-test-2.yaml
@@ -45,7 +45,6 @@ jobs:
         NODE_ENV: .example.${{ matrix.profile }}
         NODE_APP_INSTANCE: ci
 
-
     - name: Setup tmate session
       uses: mxschmitt/action-tmate@v3
       if: ${{ failure() }}
diff --git a/.github/workflows/docker-test.yaml b/.github/workflows/docker-test.yaml
index 1ca58324..83091f6f 100644
--- a/.github/workflows/docker-test.yaml
+++ b/.github/workflows/docker-test.yaml
@@ -4,7 +4,7 @@ on:
   registry_package:
     types: [ published ]
   push:
-    branches: [ feature/docker-image ]
+    branches: [ feature/docker-image2 ]
 
 jobs:
   tests:

From f6cd541b2d7f9847b973dba635f7161ce16c3b34 Mon Sep 17 00:00:00 2001
From: nickevansuk <2616208+nickevansuk@users.noreply.github.com>
Date: Wed, 14 Jun 2023 19:27:31 +0100
Subject: [PATCH 47/89] Go again

---
 .github/workflows/docker-test-2.yaml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/docker-test-2.yaml b/.github/workflows/docker-test-2.yaml
index a173f8ed..e97b986d 100644
--- a/.github/workflows/docker-test-2.yaml
+++ b/.github/workflows/docker-test-2.yaml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     container:
       image: mcr.microsoft.com/dotnet/sdk:3.1
-      options: --network-alias refimpl.api
+      options: --network-alias refimpl-api --hostname refimpl-api
     strategy:
       fail-fast: false
       matrix:
@@ -37,18 +37,18 @@ jobs:
       env:
         ASPNETCORE_ENVIRONMENT: ${{ matrix.profile }}
     
+    - name: Setup tmate session
+      uses: mxschmitt/action-tmate@v3
+      if: ${{ failure() }}
+
     - name: Run OpenActive Test Suite
       uses: openactive/openactive-test-suite@d7cbdac7f03ce75f282927fe67c9a375f1e440a8
       with:
         NODE_CONFIG: |
-          {"broker": {"outputPath": "/github/workspace/output/", "datasetSiteUrl": "https://refimpl.api:5001/openactive"}, "integrationTests": { "outputPath": "/github/workspace/output/", "conformanceCertificatePath": "/github/workspace/conformance/examples/${{ matrix.profile }}/${{ matrix.mode }}/", "useRandomOpportunities": ${{ matrix.mode == 'random' }}, "conformanceCertificateId": "https://certificates.reference-implementation.openactive.io/examples/${{ matrix.profile }}/${{ matrix.mode }}/" }}
+          {"ci": false, "broker": {"outputPath": "/github/workspace/output/", "datasetSiteUrl": "https://refimpl-api:5001/openactive"}, "integrationTests": { "outputPath": "/github/workspace/output/", "conformanceCertificatePath": "/github/workspace/conformance/examples/${{ matrix.profile }}/${{ matrix.mode }}/", "useRandomOpportunities": ${{ matrix.mode == 'random' }}, "conformanceCertificateId": "https://certificates.reference-implementation.openactive.io/examples/${{ matrix.profile }}/${{ matrix.mode }}/" }}
         NODE_ENV: .example.${{ matrix.profile }}
         NODE_APP_INSTANCE: ci
 
-    - name: Setup tmate session
-      uses: mxschmitt/action-tmate@v3
-      if: ${{ failure() }}
-
     - name: Upload test output for ${{ matrix.mode }} mode as artifact
       uses: actions/upload-artifact@v2
       if: ${{ success() || failure() }}

From a22892908a4e8d7711fdfd3ba885d9b23ca8f807 Mon Sep 17 00:00:00 2001
From: nickevansuk <2616208+nickevansuk@users.noreply.github.com>
Date: Wed, 14 Jun 2023 19:37:23 +0100
Subject: [PATCH 48/89] Go once more

---
 .github/workflows/docker-test-2.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-test-2.yaml b/.github/workflows/docker-test-2.yaml
index e97b986d..ab00cb4f 100644
--- a/.github/workflows/docker-test-2.yaml
+++ b/.github/workflows/docker-test-2.yaml
@@ -39,7 +39,7 @@ jobs:
     
     - name: Setup tmate session
       uses: mxschmitt/action-tmate@v3
-      if: ${{ failure() }}
+      if: ${{ success() || failure() }}
 
     - name: Run OpenActive Test Suite
       uses: openactive/openactive-test-suite@d7cbdac7f03ce75f282927fe67c9a375f1e440a8

From 5ef32ffc194bee8792e06b71b745750c83af35d9 Mon Sep 17 00:00:00 2001
From: nickevansuk <2616208+nickevansuk@users.noreply.github.com>
Date: Wed, 14 Jun 2023 19:47:08 +0100
Subject: [PATCH 49/89] This time with sleep

---
 .github/workflows/docker-test-2.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/docker-test-2.yaml b/.github/workflows/docker-test-2.yaml
index ab00cb4f..700c0bc5 100644
--- a/.github/workflows/docker-test-2.yaml
+++ b/.github/workflows/docker-test-2.yaml
@@ -41,6 +41,7 @@ jobs:
       uses: mxschmitt/action-tmate@v3
       if: ${{ success() || failure() }}
 
+
     - name: Run OpenActive Test Suite
       uses: openactive/openactive-test-suite@d7cbdac7f03ce75f282927fe67c9a375f1e440a8
       with:

From 359f4fd36d7fbd364763dbbac5df81d46c60c0fa Mon Sep 17 00:00:00 2001
From: nickevansuk <2616208+nickevansuk@users.noreply.github.com>
Date: Wed, 14 Jun 2023 20:01:36 +0100
Subject: [PATCH 50/89] Simplify network alias

---
 .github/workflows/docker-test-2.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-test-2.yaml b/.github/workflows/docker-test-2.yaml
index 700c0bc5..9218f24b 100644
--- a/.github/workflows/docker-test-2.yaml
+++ b/.github/workflows/docker-test-2.yaml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     container:
       image: mcr.microsoft.com/dotnet/sdk:3.1
-      options: --network-alias refimpl-api --hostname refimpl-api
+      options: --network-alias refimpl-api
     strategy:
       fail-fast: false
       matrix:

From 1d5d50b1665369547a3d82a3b323f5e7e8823232 Mon Sep 17 00:00:00 2001
From: nickevansuk <2616208+nickevansuk@users.noreply.github.com>
Date: Wed, 2 Aug 2023 16:50:34 +0100
Subject: [PATCH 51/89] Publish docker image

---
 .github/workflows/openactive-test-suite.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/openactive-test-suite.yml b/.github/workflows/openactive-test-suite.yml
index bf6baaab..f307db25 100644
--- a/.github/workflows/openactive-test-suite.yml
+++ b/.github/workflows/openactive-test-suite.yml
@@ -2,8 +2,8 @@ name: Ref Impl
 on:
   push:
     branches: [ master ]
-  # pull_request:
-  # branches: [ master ]
+  pull_request:
+    branches: [ master ]
 
 jobs:
   test-server:

From 5bc090b46aedbe87cc23105ef4acf513c5ceb976 Mon Sep 17 00:00:00 2001
From: Nick Evans <2616208+nickevansuk@users.noreply.github.com>
Date: Tue, 19 Sep 2023 19:36:34 +0100
Subject: [PATCH 52/89] Turn on auth

---
 .github/workflows/docker-test.yaml | 31 +++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/docker-test.yaml b/.github/workflows/docker-test.yaml
index 83091f6f..368b2c03 100644
--- a/.github/workflows/docker-test.yaml
+++ b/.github/workflows/docker-test.yaml
@@ -20,8 +20,9 @@ jobs:
         image: ghcr.io/openactive/reference.bookingsystem:latest # ${{ github.event.package.package_version.version }}
         # Config for postgres
         env:
-          ASPNETCORE_ENVIRONMENT: no-auth
+          ASPNETCORE_ENVIRONMENT: all-features
           ApplicationHostBaseUrl: http://reference.bookingsystem
+          OpenIdIssuerUrl: http://reference.bookingsystem.identity
         # Set health checks to wait until postgres has started
         options: >-
           --health-cmd "curl -f http://localhost/OpenActive"
@@ -32,19 +33,19 @@ jobs:
           - 80:80
 
       # Label used to access the service container
-      # reference.bookingsystem.identity:
-      #   # Docker Hub image
-      #   image: ghcr.io/openactive/reference.bookingsystem.identity:latest # ${{ github.event.package.package_version.version }}
-      #   # Config for postgres
-      #   env:
-      #     ASPNETCORE_ENVIRONMENT: all-features
-      #     ApplicationHostBaseUrl: https://reference.bookingsystem.identity
-      #   # Set health checks to wait until postgres has started
-      #   options: >-
-      #     --health-cmd "curl -f http://localhost/.well-known/openid-configuration"
-      #     --health-interval 10s
-      #     --health-timeout 5s
-      #     --health-retries 5
+      reference.bookingsystem.identity:
+        # Docker Hub image
+        image: ghcr.io/openactive/reference.bookingsystem.identity:latest # ${{ github.event.package.package_version.version }}
+        # Config for postgres
+        env:
+          ASPNETCORE_ENVIRONMENT: all-features
+          ApplicationHostBaseUrl: http://reference.bookingsystem.identity
+        # Set health checks to wait until postgres has started
+        options: >-
+          --health-cmd "curl -f http://localhost/.well-known/openid-configuration"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
 
     steps:
       - name: Run OpenActive Test Suite
@@ -52,7 +53,7 @@ jobs:
         with:
           NODE_CONFIG: |
             {"broker": {"outputPath": "/github/workspace/output/", "datasetSiteUrl": "http://reference.bookingsystem/openactive"}, "integrationTests": { "outputPath": "/github/workspace/output/", "useRandomOpportunities": true }, "sellers": {"primary": {  "@id": "http://reference.bookingsystem/api/identifiers/sellers/1","authentication": {"requestHeaders": {"X-OpenActive-Test-Seller-Id": "http://reference.bookingsystem/api/identifiers/sellers/1"}}},"secondary": {  "@id": "http://reference.bookingsystem/api/identifiers/sellers/2","authentication": {"requestHeaders": {"X-OpenActive-Test-Seller-Id": "http://reference.bookingsystem/api/identifiers/sellers/2"}}}}}
-          NODE_ENV: .example.no-auth
+          NODE_ENV: .example.all-features
           NODE_APP_INSTANCE: ci
       - name: Upload test output as artifact
         uses: actions/upload-artifact@v2

From f2b32cf9149bd480e0b0b9eb366856dba3789dd0 Mon Sep 17 00:00:00 2001
From: Nick Evans <2616208+nickevansuk@users.noreply.github.com>
Date: Tue, 19 Sep 2023 19:51:19 +0100
Subject: [PATCH 53/89] Update docker-test.yaml

---
 .github/workflows/docker-test.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-test.yaml b/.github/workflows/docker-test.yaml
index 368b2c03..0c976f61 100644
--- a/.github/workflows/docker-test.yaml
+++ b/.github/workflows/docker-test.yaml
@@ -4,7 +4,7 @@ on:
   registry_package:
     types: [ published ]
   push:
-    branches: [ feature/docker-image2 ]
+    branches: [ feature/docker-image ]
 
 jobs:
   tests:

From 29fab4b127a85d7b70d097e02756e89484345ece Mon Sep 17 00:00:00 2001
From: Nick Evans <2616208+nickevansuk@users.noreply.github.com>
Date: Tue, 19 Sep 2023 19:59:21 +0100
Subject: [PATCH 54/89] Update docker-test.yaml

---
 .github/workflows/docker-test.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/docker-test.yaml b/.github/workflows/docker-test.yaml
index 0c976f61..35e88ff7 100644
--- a/.github/workflows/docker-test.yaml
+++ b/.github/workflows/docker-test.yaml
@@ -40,6 +40,7 @@ jobs:
         env:
           ASPNETCORE_ENVIRONMENT: all-features
           ApplicationHostBaseUrl: http://reference.bookingsystem.identity
+          Urls: ''
         # Set health checks to wait until postgres has started
         options: >-
           --health-cmd "curl -f http://localhost/.well-known/openid-configuration"

From 98c2174766c27ba257be02f3ad4f516dba0a4fb0 Mon Sep 17 00:00:00 2001
From: Nick Evans <2616208+nickevansuk@users.noreply.github.com>
Date: Tue, 19 Sep 2023 20:01:24 +0100
Subject: [PATCH 55/89] Update docker-test.yaml

---
 .github/workflows/docker-test.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/docker-test.yaml b/.github/workflows/docker-test.yaml
index 35e88ff7..bf750910 100644
--- a/.github/workflows/docker-test.yaml
+++ b/.github/workflows/docker-test.yaml
@@ -41,6 +41,7 @@ jobs:
           ASPNETCORE_ENVIRONMENT: all-features
           ApplicationHostBaseUrl: http://reference.bookingsystem.identity
           Urls: ''
+          ASPNETCORE_URLS: ''
         # Set health checks to wait until postgres has started
         options: >-
           --health-cmd "curl -f http://localhost/.well-known/openid-configuration"

From 68a1d98f88d260ee06663e18a13dc8816da6d4a8 Mon Sep 17 00:00:00 2001
From: Nick Evans <2616208+nickevansuk@users.noreply.github.com>
Date: Tue, 6 Aug 2024 19:54:54 +0100
Subject: [PATCH 56/89] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a2c2dbb8..5d448e1a 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 
-# OpenActive.Server.NET [![Nuget](https://img.shields.io/nuget/v/OpenActive.Server.NET.svg)](https://www.nuget.org/packages/OpenActive.Server.NET/) [![OpenActive.Server.NET.Test](https://github.com/openactive/OpenActive.Server.NET/workflows/OpenActive.Server.NET.Tests/badge.svg?branch=master)](https://github.com/openactive/OpenActive.Server.NET/actions?query=workflow%3AOpenActive.Server.NET.Tests)
+# OpenActive.Server.NET [![Nuget](https://img.shields.io/nuget/v/OpenActive.Server.NET.svg)](https://www.nuget.org/packages/OpenActive.Server.NET/)
 
 The Open Booking SDK for .NET provides components that aid the implementation of the OpenActive specifications, including the [Open Booking API](https://openactive.io/open-booking-api/EditorsDraft/).
 

From 2aa00a4b30b488bf5f5d8081eafc1f759106769c Mon Sep 17 00:00:00 2001
From: Nick Evans <2616208+nickevansuk@users.noreply.github.com>
Date: Thu, 21 Nov 2024 18:29:23 +0000
Subject: [PATCH 57/89] Update docker-test-2.yaml

---
 .github/workflows/docker-test-2.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-test-2.yaml b/.github/workflows/docker-test-2.yaml
index 9218f24b..d102f6eb 100644
--- a/.github/workflows/docker-test-2.yaml
+++ b/.github/workflows/docker-test-2.yaml
@@ -43,7 +43,7 @@ jobs:
 
 
     - name: Run OpenActive Test Suite
-      uses: openactive/openactive-test-suite@d7cbdac7f03ce75f282927fe67c9a375f1e440a8
+      uses: openactive/openactive-test-suite@master
       with:
         NODE_CONFIG: |
           {"ci": false, "broker": {"outputPath": "/github/workspace/output/", "datasetSiteUrl": "https://refimpl-api:5001/openactive"}, "integrationTests": { "outputPath": "/github/workspace/output/", "conformanceCertificatePath": "/github/workspace/conformance/examples/${{ matrix.profile }}/${{ matrix.mode }}/", "useRandomOpportunities": ${{ matrix.mode == 'random' }}, "conformanceCertificateId": "https://certificates.reference-implementation.openactive.io/examples/${{ matrix.profile }}/${{ matrix.mode }}/" }}
@@ -55,4 +55,4 @@ jobs:
       if: ${{ success() || failure() }}
       with:
         name: core.${{ matrix.mode }}.${{ matrix.profile }}
-        path: ./output/
\ No newline at end of file
+        path: ./output/

From aaaf230888bcc1f830cdd27035e4eef107311cc6 Mon Sep 17 00:00:00 2001
From: Nick Evans <2616208+nickevansuk@users.noreply.github.com>
Date: Thu, 21 Nov 2024 18:31:20 +0000
Subject: [PATCH 58/89] Update docker-test-2.yaml

---
 .github/workflows/docker-test-2.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-test-2.yaml b/.github/workflows/docker-test-2.yaml
index d102f6eb..59131ae1 100644
--- a/.github/workflows/docker-test-2.yaml
+++ b/.github/workflows/docker-test-2.yaml
@@ -51,7 +51,7 @@ jobs:
         NODE_APP_INSTANCE: ci
 
     - name: Upload test output for ${{ matrix.mode }} mode as artifact
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       if: ${{ success() || failure() }}
       with:
         name: core.${{ matrix.mode }}.${{ matrix.profile }}

From ed9d2bf8e4764f3065524167eaee49ea2c0bae93 Mon Sep 17 00:00:00 2001
From: Nick Evans <2616208+nickevansuk@users.noreply.github.com>
Date: Thu, 21 Nov 2024 18:34:22 +0000
Subject: [PATCH 59/89] Update docker-test.yaml

---
 .github/workflows/docker-test.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-test.yaml b/.github/workflows/docker-test.yaml
index bf750910..f429d6e0 100644
--- a/.github/workflows/docker-test.yaml
+++ b/.github/workflows/docker-test.yaml
@@ -51,14 +51,14 @@ jobs:
 
     steps:
       - name: Run OpenActive Test Suite
-        uses: openactive/openactive-test-suite@d7cbdac7f03ce75f282927fe67c9a375f1e440a8
+        uses: openactive/openactive-test-suite@latest
         with:
           NODE_CONFIG: |
             {"broker": {"outputPath": "/github/workspace/output/", "datasetSiteUrl": "http://reference.bookingsystem/openactive"}, "integrationTests": { "outputPath": "/github/workspace/output/", "useRandomOpportunities": true }, "sellers": {"primary": {  "@id": "http://reference.bookingsystem/api/identifiers/sellers/1","authentication": {"requestHeaders": {"X-OpenActive-Test-Seller-Id": "http://reference.bookingsystem/api/identifiers/sellers/1"}}},"secondary": {  "@id": "http://reference.bookingsystem/api/identifiers/sellers/2","authentication": {"requestHeaders": {"X-OpenActive-Test-Seller-Id": "http://reference.bookingsystem/api/identifiers/sellers/2"}}}}}
           NODE_ENV: .example.all-features
           NODE_APP_INSTANCE: ci
       - name: Upload test output as artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         if: ${{ success() || failure() }}
         with:
           name: docker-test

From 48410d46ce3e63064f99e77e201fac51b4f1d16a Mon Sep 17 00:00:00 2001
From: Nick Evans <2616208+nickevansuk@users.noreply.github.com>
Date: Thu, 21 Nov 2024 18:37:17 +0000
Subject: [PATCH 60/89] Update docker-test.yaml

---
 .github/workflows/docker-test.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-test.yaml b/.github/workflows/docker-test.yaml
index f429d6e0..d8bde49e 100644
--- a/.github/workflows/docker-test.yaml
+++ b/.github/workflows/docker-test.yaml
@@ -51,7 +51,7 @@ jobs:
 
     steps:
       - name: Run OpenActive Test Suite
-        uses: openactive/openactive-test-suite@latest
+        uses: openactive/openactive-test-suite@master
         with:
           NODE_CONFIG: |
             {"broker": {"outputPath": "/github/workspace/output/", "datasetSiteUrl": "http://reference.bookingsystem/openactive"}, "integrationTests": { "outputPath": "/github/workspace/output/", "useRandomOpportunities": true }, "sellers": {"primary": {  "@id": "http://reference.bookingsystem/api/identifiers/sellers/1","authentication": {"requestHeaders": {"X-OpenActive-Test-Seller-Id": "http://reference.bookingsystem/api/identifiers/sellers/1"}}},"secondary": {  "@id": "http://reference.bookingsystem/api/identifiers/sellers/2","authentication": {"requestHeaders": {"X-OpenActive-Test-Seller-Id": "http://reference.bookingsystem/api/identifiers/sellers/2"}}}}}

From 0e321450662a0f63e36251a340f73ecaf4665dfb Mon Sep 17 00:00:00 2001
From: Nick Evans <2616208+nickevansuk@users.noreply.github.com>
Date: Thu, 21 Nov 2024 18:45:35 +0000
Subject: [PATCH 61/89] Create docker-test-3.yml

---
 .github/workflows/docker-test-3.yml | 45 +++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 .github/workflows/docker-test-3.yml

diff --git a/.github/workflows/docker-test-3.yml b/.github/workflows/docker-test-3.yml
new file mode 100644
index 00000000..0510f7f1
--- /dev/null
+++ b/.github/workflows/docker-test-3.yml
@@ -0,0 +1,45 @@
+name: Test using Docker for CI
+on:
+  push:
+    branches: [ feature/docker-image ]
+
+jobs:
+  docker-test:
+    runs-on: ubuntu-latest
+    container:
+      image: mcr.microsoft.com/dotnet/sdk:3.1
+    strategy:
+      fail-fast: false
+      matrix:
+        mode: ['random']
+        profile: ['no-auth']
+    steps:
+    - name: Checkout OpenActive.Server.NET
+      uses: actions/checkout@v2
+      with:
+        path: server
+    - name: Install OpenActive.Server.NET dependencies
+      if: ${{ matrix.profile != 'no-auth' && matrix.profile != 'single-seller' }}
+      run: dotnet restore ./server/
+    - name: Build .NET Core Booking Server Reference Implementation
+      run: dotnet build ./server/Examples/BookingSystem.AspNetCore/BookingSystem.AspNetCore.csproj --configuration Release ${{ matrix.profile != 'no-auth' && matrix.profile != 'single-seller' && '--no-restore' || '' }}
+    - name: Start .NET Core Booking Server Reference Implementation
+      run: |
+        dotnet run --no-launch-profile --project ./server/Examples/BookingSystem.AspNetCore/BookingSystem.AspNetCore.csproj --configuration Release --no-build &
+      env:
+        ASPNETCORE_ENVIRONMENT: ${{ matrix.profile }}
+  
+    - name: Run OpenActive Test Suite
+      uses: openactive/openactive-test-suite@master
+      with:
+        NODE_CONFIG: |
+          {"ci": false, "broker": {"outputPath": "/github/workspace/output/", "datasetSiteUrl": "http://host.docker.internal/openactive"}, "integrationTests": { "outputPath": "/github/workspace/output/", "conformanceCertificatePath": "/github/workspace/conformance/examples/${{ matrix.profile }}/${{ matrix.mode }}/", "useRandomOpportunities": ${{ matrix.mode == 'random' }}, "conformanceCertificateId": "https://certificates.reference-implementation.openactive.io/examples/${{ matrix.profile }}/${{ matrix.mode }}/" }}
+        NODE_ENV: .example.${{ matrix.profile }}
+        NODE_APP_INSTANCE: ci
+
+    - name: Upload test output for ${{ matrix.mode }} mode as artifact
+      uses: actions/upload-artifact@v4
+      if: ${{ success() || failure() }}
+      with:
+        name: core.${{ matrix.mode }}.${{ matrix.profile }}
+        path: ./output/

From 47ec901be9144e3ab440ba3de871625803b07d73 Mon Sep 17 00:00:00 2001
From: Nick Evans <2616208+nickevansuk@users.noreply.github.com>
Date: Thu, 21 Nov 2024 18:45:55 +0000
Subject: [PATCH 62/89] Update docker-test-2.yaml

---
 .github/workflows/docker-test-2.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-test-2.yaml b/.github/workflows/docker-test-2.yaml
index 59131ae1..9da522c7 100644
--- a/.github/workflows/docker-test-2.yaml
+++ b/.github/workflows/docker-test-2.yaml
@@ -1,7 +1,7 @@
 name: Test using Docker for CI
 on:
   push:
-    branches: [ feature/docker-image ]
+    branches: [ feature/docker-image-null ]
 
 jobs:
   docker-test:

From 185405103dff9a9360a650654c3bad5d3f2f3f4d Mon Sep 17 00:00:00 2001
From: Nick Evans <2616208+nickevansuk@users.noreply.github.com>
Date: Thu, 21 Nov 2024 18:46:07 +0000
Subject: [PATCH 63/89] Update docker-test.yaml

---
 .github/workflows/docker-test.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-test.yaml b/.github/workflows/docker-test.yaml
index d8bde49e..b8f16671 100644
--- a/.github/workflows/docker-test.yaml
+++ b/.github/workflows/docker-test.yaml
@@ -4,7 +4,7 @@ on:
   registry_package:
     types: [ published ]
   push:
-    branches: [ feature/docker-image ]
+    branches: [ feature/docker-image-null ]
 
 jobs:
   tests:

From 9c09eb380ad155be849c4fd86534fbe560f6195f Mon Sep 17 00:00:00 2001
From: Nick Evans <2616208+nickevansuk@users.noreply.github.com>
Date: Thu, 21 Nov 2024 18:46:19 +0000
Subject: [PATCH 64/89] Update openactive-test-suite.yml

---
 .github/workflows/openactive-test-suite.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/openactive-test-suite.yml b/.github/workflows/openactive-test-suite.yml
index f307db25..26458816 100644
--- a/.github/workflows/openactive-test-suite.yml
+++ b/.github/workflows/openactive-test-suite.yml
@@ -1,9 +1,9 @@
 name: Ref Impl
 on:
   push:
-    branches: [ master ]
+    branches: [ master-null ]
   pull_request:
-    branches: [ master ]
+    branches: [ master-null ]
 
 jobs:
   test-server:

From c0b8471c04242c5793ec7fbd2d692ea1417322af Mon Sep 17 00:00:00 2001
From: Nick Evans <2616208+nickevansuk@users.noreply.github.com>
Date: Thu, 21 Nov 2024 18:49:43 +0000
Subject: [PATCH 65/89] Update docker-test-3.yml

---
 .github/workflows/docker-test-3.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docker-test-3.yml b/.github/workflows/docker-test-3.yml
index 0510f7f1..055d1c7b 100644
--- a/.github/workflows/docker-test-3.yml
+++ b/.github/workflows/docker-test-3.yml
@@ -28,12 +28,15 @@ jobs:
         dotnet run --no-launch-profile --project ./server/Examples/BookingSystem.AspNetCore/BookingSystem.AspNetCore.csproj --configuration Release --no-build &
       env:
         ASPNETCORE_ENVIRONMENT: ${{ matrix.profile }}
+
+    - name: Create output dir
+      run: mkdir -p ./output/
   
     - name: Run OpenActive Test Suite
       uses: openactive/openactive-test-suite@master
       with:
         NODE_CONFIG: |
-          {"ci": false, "broker": {"outputPath": "/github/workspace/output/", "datasetSiteUrl": "http://host.docker.internal/openactive"}, "integrationTests": { "outputPath": "/github/workspace/output/", "conformanceCertificatePath": "/github/workspace/conformance/examples/${{ matrix.profile }}/${{ matrix.mode }}/", "useRandomOpportunities": ${{ matrix.mode == 'random' }}, "conformanceCertificateId": "https://certificates.reference-implementation.openactive.io/examples/${{ matrix.profile }}/${{ matrix.mode }}/" }}
+          {"ci": true, "broker": {"outputPath": "/github/workspace/output/", "datasetSiteUrl": "http://host.docker.internal/openactive"}, "integrationTests": { "outputPath": "/github/workspace/output/", "conformanceCertificatePath": "/github/workspace/conformance/examples/${{ matrix.profile }}/${{ matrix.mode }}/", "useRandomOpportunities": ${{ matrix.mode == 'random' }}, "conformanceCertificateId": "https://certificates.reference-implementation.openactive.io/examples/${{ matrix.profile }}/${{ matrix.mode }}/" }}
         NODE_ENV: .example.${{ matrix.profile }}
         NODE_APP_INSTANCE: ci
 

From 9dc389d721e8097f0b41e29a8059d3cfde4d7b1e Mon Sep 17 00:00:00 2001
From: Nick Evans <2616208+nickevansuk@users.noreply.github.com>
Date: Thu, 21 Nov 2024 18:52:24 +0000
Subject: [PATCH 66/89] Update docker-test-3.yml

---
 .github/workflows/docker-test-3.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-test-3.yml b/.github/workflows/docker-test-3.yml
index 055d1c7b..4fa31546 100644
--- a/.github/workflows/docker-test-3.yml
+++ b/.github/workflows/docker-test-3.yml
@@ -36,7 +36,7 @@ jobs:
       uses: openactive/openactive-test-suite@master
       with:
         NODE_CONFIG: |
-          {"ci": true, "broker": {"outputPath": "/github/workspace/output/", "datasetSiteUrl": "http://host.docker.internal/openactive"}, "integrationTests": { "outputPath": "/github/workspace/output/", "conformanceCertificatePath": "/github/workspace/conformance/examples/${{ matrix.profile }}/${{ matrix.mode }}/", "useRandomOpportunities": ${{ matrix.mode == 'random' }}, "conformanceCertificateId": "https://certificates.reference-implementation.openactive.io/examples/${{ matrix.profile }}/${{ matrix.mode }}/" }}
+          {"ci": true, "broker": {"outputPath": "/github/workspace/output/", "datasetSiteUrl": "http://host.docker.internal:5001/openactive"}, "integrationTests": { "outputPath": "/github/workspace/output/", "conformanceCertificatePath": "/github/workspace/conformance/examples/${{ matrix.profile }}/${{ matrix.mode }}/", "useRandomOpportunities": ${{ matrix.mode == 'random' }}, "conformanceCertificateId": "https://certificates.reference-implementation.openactive.io/examples/${{ matrix.profile }}/${{ matrix.mode }}/" }}
         NODE_ENV: .example.${{ matrix.profile }}
         NODE_APP_INSTANCE: ci
 

From ce90a31fd499cba8315898b3944a6e637ee91a72 Mon Sep 17 00:00:00 2001
From: Nick Evans <2616208+nickevansuk@users.noreply.github.com>
Date: Thu, 21 Nov 2024 18:54:51 +0000
Subject: [PATCH 67/89] Update docker-test-3.yml

---
 .github/workflows/docker-test-3.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-test-3.yml b/.github/workflows/docker-test-3.yml
index 4fa31546..101d6a23 100644
--- a/.github/workflows/docker-test-3.yml
+++ b/.github/workflows/docker-test-3.yml
@@ -36,7 +36,7 @@ jobs:
       uses: openactive/openactive-test-suite@master
       with:
         NODE_CONFIG: |
-          {"ci": true, "broker": {"outputPath": "/github/workspace/output/", "datasetSiteUrl": "http://host.docker.internal:5001/openactive"}, "integrationTests": { "outputPath": "/github/workspace/output/", "conformanceCertificatePath": "/github/workspace/conformance/examples/${{ matrix.profile }}/${{ matrix.mode }}/", "useRandomOpportunities": ${{ matrix.mode == 'random' }}, "conformanceCertificateId": "https://certificates.reference-implementation.openactive.io/examples/${{ matrix.profile }}/${{ matrix.mode }}/" }}
+          {"ci": true, "broker": {"outputPath": "/github/workspace/output/", "datasetSiteUrl": "http://localhost:5001/openactive"}, "integrationTests": { "outputPath": "/github/workspace/output/", "conformanceCertificatePath": "/github/workspace/conformance/examples/${{ matrix.profile }}/${{ matrix.mode }}/", "useRandomOpportunities": ${{ matrix.mode == 'random' }}, "conformanceCertificateId": "https://certificates.reference-implementation.openactive.io/examples/${{ matrix.profile }}/${{ matrix.mode }}/" }}
         NODE_ENV: .example.${{ matrix.profile }}
         NODE_APP_INSTANCE: ci
 

From 4e3575ecfe65b34319c53ddcaeea31baccaf049b Mon Sep 17 00:00:00 2001
From: Nick Evans <2616208+nickevansuk@users.noreply.github.com>
Date: Thu, 21 Nov 2024 19:03:59 +0000
Subject: [PATCH 68/89] Update docker-test-3.yml

---
 .github/workflows/docker-test-3.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docker-test-3.yml b/.github/workflows/docker-test-3.yml
index 101d6a23..d75dc695 100644
--- a/.github/workflows/docker-test-3.yml
+++ b/.github/workflows/docker-test-3.yml
@@ -8,6 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     container:
       image: mcr.microsoft.com/dotnet/sdk:3.1
+      options: --network-alias booking.system --port 5001:5001
     strategy:
       fail-fast: false
       matrix:
@@ -36,7 +37,7 @@ jobs:
       uses: openactive/openactive-test-suite@master
       with:
         NODE_CONFIG: |
-          {"ci": true, "broker": {"outputPath": "/github/workspace/output/", "datasetSiteUrl": "http://localhost:5001/openactive"}, "integrationTests": { "outputPath": "/github/workspace/output/", "conformanceCertificatePath": "/github/workspace/conformance/examples/${{ matrix.profile }}/${{ matrix.mode }}/", "useRandomOpportunities": ${{ matrix.mode == 'random' }}, "conformanceCertificateId": "https://certificates.reference-implementation.openactive.io/examples/${{ matrix.profile }}/${{ matrix.mode }}/" }}
+          {"ci": true, "broker": {"outputPath": "/github/workspace/output/", "datasetSiteUrl": "http://booking.system:5001/openactive"}, "integrationTests": { "outputPath": "/github/workspace/output/", "conformanceCertificatePath": "/github/workspace/conformance/examples/${{ matrix.profile }}/${{ matrix.mode }}/", "useRandomOpportunities": ${{ matrix.mode == 'random' }}, "conformanceCertificateId": "https://certificates.reference-implementation.openactive.io/examples/${{ matrix.profile }}/${{ matrix.mode }}/" }}
         NODE_ENV: .example.${{ matrix.profile }}
         NODE_APP_INSTANCE: ci
 

From 814dbff4a7dac7cfe60311dfc7da26a1631fea50 Mon Sep 17 00:00:00 2001
From: Nick Evans <2616208+nickevansuk@users.noreply.github.com>
Date: Thu, 21 Nov 2024 19:07:11 +0000
Subject: [PATCH 69/89] Update docker-test-3.yml

---
 .github/workflows/docker-test-3.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-test-3.yml b/.github/workflows/docker-test-3.yml
index d75dc695..80db285d 100644
--- a/.github/workflows/docker-test-3.yml
+++ b/.github/workflows/docker-test-3.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     container:
       image: mcr.microsoft.com/dotnet/sdk:3.1
-      options: --network-alias booking.system --port 5001:5001
+      options: --network-alias booking.system --expose 5001
     strategy:
       fail-fast: false
       matrix:

From 13e8057ce5f2b77bd8ad9d0d775afae02eb1e0e3 Mon Sep 17 00:00:00 2001
From: Nick Evans <2616208+nickevansuk@users.noreply.github.com>
Date: Thu, 21 Nov 2024 19:12:03 +0000
Subject: [PATCH 70/89] Update docker-test-3.yml

---
 .github/workflows/docker-test-3.yml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/docker-test-3.yml b/.github/workflows/docker-test-3.yml
index 80db285d..c92f55ee 100644
--- a/.github/workflows/docker-test-3.yml
+++ b/.github/workflows/docker-test-3.yml
@@ -6,9 +6,6 @@ on:
 jobs:
   docker-test:
     runs-on: ubuntu-latest
-    container:
-      image: mcr.microsoft.com/dotnet/sdk:3.1
-      options: --network-alias booking.system --expose 5001
     strategy:
       fail-fast: false
       matrix:
@@ -19,6 +16,10 @@ jobs:
       uses: actions/checkout@v2
       with:
         path: server
+    - name: Setup .NET Core 3.1.419
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 3.1.419
     - name: Install OpenActive.Server.NET dependencies
       if: ${{ matrix.profile != 'no-auth' && matrix.profile != 'single-seller' }}
       run: dotnet restore ./server/
@@ -29,7 +30,8 @@ jobs:
         dotnet run --no-launch-profile --project ./server/Examples/BookingSystem.AspNetCore/BookingSystem.AspNetCore.csproj --configuration Release --no-build &
       env:
         ASPNETCORE_ENVIRONMENT: ${{ matrix.profile }}
-
+        ApplicationHostBaseUrl: http://booking.system
+          
     - name: Create output dir
       run: mkdir -p ./output/
   
@@ -37,7 +39,7 @@ jobs:
       uses: openactive/openactive-test-suite@master
       with:
         NODE_CONFIG: |
-          {"ci": true, "broker": {"outputPath": "/github/workspace/output/", "datasetSiteUrl": "http://booking.system:5001/openactive"}, "integrationTests": { "outputPath": "/github/workspace/output/", "conformanceCertificatePath": "/github/workspace/conformance/examples/${{ matrix.profile }}/${{ matrix.mode }}/", "useRandomOpportunities": ${{ matrix.mode == 'random' }}, "conformanceCertificateId": "https://certificates.reference-implementation.openactive.io/examples/${{ matrix.profile }}/${{ matrix.mode }}/" }}
+          {"ci": true, "broker": {"outputPath": "/github/workspace/output/", "datasetSiteUrl": "http://host.docker.internal:5001/openactive"}, "integrationTests": { "outputPath": "/github/workspace/output/", "conformanceCertificatePath": "/github/workspace/conformance/examples/${{ matrix.profile }}/${{ matrix.mode }}/", "useRandomOpportunities": ${{ matrix.mode == 'random' }}, "conformanceCertificateId": "https://certificates.reference-implementation.openactive.io/examples/${{ matrix.profile }}/${{ matrix.mode }}/" }}
         NODE_ENV: .example.${{ matrix.profile }}
         NODE_APP_INSTANCE: ci
 

From 6f7eed95a71932afdc5197e56327d1d642cff82a Mon Sep 17 00:00:00 2001
From: Nick Evans <2616208+nickevansuk@users.noreply.github.com>
Date: Thu, 21 Nov 2024 19:12:28 +0000
Subject: [PATCH 71/89] Update docker-test-3.yml

---
 .github/workflows/docker-test-3.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-test-3.yml b/.github/workflows/docker-test-3.yml
index c92f55ee..9a0c7e68 100644
--- a/.github/workflows/docker-test-3.yml
+++ b/.github/workflows/docker-test-3.yml
@@ -30,7 +30,7 @@ jobs:
         dotnet run --no-launch-profile --project ./server/Examples/BookingSystem.AspNetCore/BookingSystem.AspNetCore.csproj --configuration Release --no-build &
       env:
         ASPNETCORE_ENVIRONMENT: ${{ matrix.profile }}
-        ApplicationHostBaseUrl: http://booking.system
+        ApplicationHostBaseUrl: http://host.docker.internal
           
     - name: Create output dir
       run: mkdir -p ./output/

From cb73e5c6350862a797af612ab55b89e6024eab60 Mon Sep 17 00:00:00 2001
From: Nick Evans <2616208+nickevansuk@users.noreply.github.com>
Date: Thu, 21 Nov 2024 19:16:16 +0000
Subject: [PATCH 72/89] Update docker-test-3.yml

---
 .github/workflows/docker-test-3.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-test-3.yml b/.github/workflows/docker-test-3.yml
index 9a0c7e68..a21cd67f 100644
--- a/.github/workflows/docker-test-3.yml
+++ b/.github/workflows/docker-test-3.yml
@@ -39,7 +39,7 @@ jobs:
       uses: openactive/openactive-test-suite@master
       with:
         NODE_CONFIG: |
-          {"ci": true, "broker": {"outputPath": "/github/workspace/output/", "datasetSiteUrl": "http://host.docker.internal:5001/openactive"}, "integrationTests": { "outputPath": "/github/workspace/output/", "conformanceCertificatePath": "/github/workspace/conformance/examples/${{ matrix.profile }}/${{ matrix.mode }}/", "useRandomOpportunities": ${{ matrix.mode == 'random' }}, "conformanceCertificateId": "https://certificates.reference-implementation.openactive.io/examples/${{ matrix.profile }}/${{ matrix.mode }}/" }}
+          {"ci": true, "broker": {"outputPath": "/github/workspace/output/", "datasetSiteUrl": "http://172.17.0.1:5001/openactive"}, "integrationTests": { "outputPath": "/github/workspace/output/", "conformanceCertificatePath": "/github/workspace/conformance/examples/${{ matrix.profile }}/${{ matrix.mode }}/", "useRandomOpportunities": ${{ matrix.mode == 'random' }}, "conformanceCertificateId": "https://certificates.reference-implementation.openactive.io/examples/${{ matrix.profile }}/${{ matrix.mode }}/" }}
         NODE_ENV: .example.${{ matrix.profile }}
         NODE_APP_INSTANCE: ci
 

From 0e184f91d2f22e47507385fb33da6eafa3aecb93 Mon Sep 17 00:00:00 2001
From: Nick Evans <2616208+nickevansuk@users.noreply.github.com>
Date: Thu, 21 Nov 2024 19:21:17 +0000
Subject: [PATCH 73/89] Update docker-test-3.yml

---
 .github/workflows/docker-test-3.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-test-3.yml b/.github/workflows/docker-test-3.yml
index a21cd67f..df170a9b 100644
--- a/.github/workflows/docker-test-3.yml
+++ b/.github/workflows/docker-test-3.yml
@@ -39,7 +39,7 @@ jobs:
       uses: openactive/openactive-test-suite@master
       with:
         NODE_CONFIG: |
-          {"ci": true, "broker": {"outputPath": "/github/workspace/output/", "datasetSiteUrl": "http://172.17.0.1:5001/openactive"}, "integrationTests": { "outputPath": "/github/workspace/output/", "conformanceCertificatePath": "/github/workspace/conformance/examples/${{ matrix.profile }}/${{ matrix.mode }}/", "useRandomOpportunities": ${{ matrix.mode == 'random' }}, "conformanceCertificateId": "https://certificates.reference-implementation.openactive.io/examples/${{ matrix.profile }}/${{ matrix.mode }}/" }}
+          {"ci": true, "broker": {"outputPath": "/github/workspace/output/", "datasetSiteUrl": "http://localhost:5001/openactive"}, "integrationTests": { "outputPath": "/github/workspace/output/", "conformanceCertificatePath": "/github/workspace/conformance/examples/${{ matrix.profile }}/${{ matrix.mode }}/", "useRandomOpportunities": ${{ matrix.mode == 'random' }}, "conformanceCertificateId": "https://certificates.reference-implementation.openactive.io/examples/${{ matrix.profile }}/${{ matrix.mode }}/" }}
         NODE_ENV: .example.${{ matrix.profile }}
         NODE_APP_INSTANCE: ci
 

From f3223bc93c9a28c5b7318c3082420ba7587384e9 Mon Sep 17 00:00:00 2001
From: Nick Evans <2616208+nickevansuk@users.noreply.github.com>
Date: Fri, 22 Nov 2024 09:30:38 +0000
Subject: [PATCH 74/89] Update docker-test-3.yml

---
 .github/workflows/docker-test-3.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/docker-test-3.yml b/.github/workflows/docker-test-3.yml
index df170a9b..67ebaebf 100644
--- a/.github/workflows/docker-test-3.yml
+++ b/.github/workflows/docker-test-3.yml
@@ -6,6 +6,9 @@ on:
 jobs:
   docker-test:
     runs-on: ubuntu-latest
+    container:
+      image: mcr.microsoft.com/dotnet/sdk:3.1
+      options: --network-alias booking.system --expose 5001
     strategy:
       fail-fast: false
       matrix:
@@ -16,10 +19,6 @@ jobs:
       uses: actions/checkout@v2
       with:
         path: server
-    - name: Setup .NET Core 3.1.419
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 3.1.419
     - name: Install OpenActive.Server.NET dependencies
       if: ${{ matrix.profile != 'no-auth' && matrix.profile != 'single-seller' }}
       run: dotnet restore ./server/
@@ -39,7 +38,7 @@ jobs:
       uses: openactive/openactive-test-suite@master
       with:
         NODE_CONFIG: |
-          {"ci": true, "broker": {"outputPath": "/github/workspace/output/", "datasetSiteUrl": "http://localhost:5001/openactive"}, "integrationTests": { "outputPath": "/github/workspace/output/", "conformanceCertificatePath": "/github/workspace/conformance/examples/${{ matrix.profile }}/${{ matrix.mode }}/", "useRandomOpportunities": ${{ matrix.mode == 'random' }}, "conformanceCertificateId": "https://certificates.reference-implementation.openactive.io/examples/${{ matrix.profile }}/${{ matrix.mode }}/" }}
+          {"ci": true, "broker": {"outputPath": "/github/workspace/output/", "datasetSiteUrl": "http://booking.system:5001/openactive"}, "integrationTests": { "outputPath": "/github/workspace/output/", "conformanceCertificatePath": "/github/workspace/conformance/examples/${{ matrix.profile }}/${{ matrix.mode }}/", "useRandomOpportunities": ${{ matrix.mode == 'random' }}, "conformanceCertificateId": "https://certificates.reference-implementation.openactive.io/examples/${{ matrix.profile }}/${{ matrix.mode }}/" }}
         NODE_ENV: .example.${{ matrix.profile }}
         NODE_APP_INSTANCE: ci
 

From e74004620516be535c0b7c23c2ea9286b410f999 Mon Sep 17 00:00:00 2001
From: Nick Evans <2616208+nickevansuk@users.noreply.github.com>
Date: Fri, 22 Nov 2024 09:33:37 +0000
Subject: [PATCH 75/89] Update docker-test-3.yml

---
 .github/workflows/docker-test-3.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-test-3.yml b/.github/workflows/docker-test-3.yml
index 67ebaebf..ea363af4 100644
--- a/.github/workflows/docker-test-3.yml
+++ b/.github/workflows/docker-test-3.yml
@@ -29,7 +29,7 @@ jobs:
         dotnet run --no-launch-profile --project ./server/Examples/BookingSystem.AspNetCore/BookingSystem.AspNetCore.csproj --configuration Release --no-build &
       env:
         ASPNETCORE_ENVIRONMENT: ${{ matrix.profile }}
-        ApplicationHostBaseUrl: http://host.docker.internal
+        ApplicationHostBaseUrl: http://booking.system
           
     - name: Create output dir
       run: mkdir -p ./output/

From 56dc98f5c02f17d2d795a0923ffdf6728327d271 Mon Sep 17 00:00:00 2001
From: Nick Evans <2616208+nickevansuk@users.noreply.github.com>
Date: Fri, 22 Nov 2024 09:34:32 +0000
Subject: [PATCH 76/89] Update docker-test-3.yml

---
 .github/workflows/docker-test-3.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/docker-test-3.yml b/.github/workflows/docker-test-3.yml
index ea363af4..e516f32a 100644
--- a/.github/workflows/docker-test-3.yml
+++ b/.github/workflows/docker-test-3.yml
@@ -30,6 +30,8 @@ jobs:
       env:
         ASPNETCORE_ENVIRONMENT: ${{ matrix.profile }}
         ApplicationHostBaseUrl: http://booking.system
+        Urls: ''
+        ASPNETCORE_URLS: ''
           
     - name: Create output dir
       run: mkdir -p ./output/

From fd198247679c87384f220aab52e584b648448597 Mon Sep 17 00:00:00 2001
From: Nick Evans <2616208+nickevansuk@users.noreply.github.com>
Date: Fri, 22 Nov 2024 09:35:58 +0000
Subject: [PATCH 77/89] Update docker-test-3.yml

---
 .github/workflows/docker-test-3.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-test-3.yml b/.github/workflows/docker-test-3.yml
index e516f32a..74d81d9b 100644
--- a/.github/workflows/docker-test-3.yml
+++ b/.github/workflows/docker-test-3.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     container:
       image: mcr.microsoft.com/dotnet/sdk:3.1
-      options: --network-alias booking.system --expose 5001
+      options: --network-alias booking.system --expose 5001 -p 5001:5001
     strategy:
       fail-fast: false
       matrix:

From 9ba8cf889b91f81cde3daadc0338e7152c2fb983 Mon Sep 17 00:00:00 2001
From: Nick Evans <2616208+nickevansuk@users.noreply.github.com>
Date: Fri, 22 Nov 2024 09:40:17 +0000
Subject: [PATCH 78/89] Update docker-test-3.yml

---
 .github/workflows/docker-test-3.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-test-3.yml b/.github/workflows/docker-test-3.yml
index 74d81d9b..3b87d820 100644
--- a/.github/workflows/docker-test-3.yml
+++ b/.github/workflows/docker-test-3.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     container:
       image: mcr.microsoft.com/dotnet/sdk:3.1
-      options: --network-alias booking.system --expose 5001 -p 5001:5001
+      options: --network-alias booking.system --expose 5000
     strategy:
       fail-fast: false
       matrix:
@@ -40,7 +40,7 @@ jobs:
       uses: openactive/openactive-test-suite@master
       with:
         NODE_CONFIG: |
-          {"ci": true, "broker": {"outputPath": "/github/workspace/output/", "datasetSiteUrl": "http://booking.system:5001/openactive"}, "integrationTests": { "outputPath": "/github/workspace/output/", "conformanceCertificatePath": "/github/workspace/conformance/examples/${{ matrix.profile }}/${{ matrix.mode }}/", "useRandomOpportunities": ${{ matrix.mode == 'random' }}, "conformanceCertificateId": "https://certificates.reference-implementation.openactive.io/examples/${{ matrix.profile }}/${{ matrix.mode }}/" }}
+          {"ci": true, "broker": {"outputPath": "/github/workspace/output/", "datasetSiteUrl": "http://booking.system:5000/openactive"}, "integrationTests": { "outputPath": "/github/workspace/output/", "conformanceCertificatePath": "/github/workspace/conformance/examples/${{ matrix.profile }}/${{ matrix.mode }}/", "useRandomOpportunities": ${{ matrix.mode == 'random' }}, "conformanceCertificateId": "https://certificates.reference-implementation.openactive.io/examples/${{ matrix.profile }}/${{ matrix.mode }}/" }}
         NODE_ENV: .example.${{ matrix.profile }}
         NODE_APP_INSTANCE: ci
 

From 3a3dd940f37256caa68285bf8d7d14bceea5d731 Mon Sep 17 00:00:00 2001
From: Nick Evans <2616208+nickevansuk@users.noreply.github.com>
Date: Fri, 22 Nov 2024 09:52:45 +0000
Subject: [PATCH 79/89] Update docker-test-3.yml

---
 .github/workflows/docker-test-3.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-test-3.yml b/.github/workflows/docker-test-3.yml
index 3b87d820..e41623cd 100644
--- a/.github/workflows/docker-test-3.yml
+++ b/.github/workflows/docker-test-3.yml
@@ -30,8 +30,8 @@ jobs:
       env:
         ASPNETCORE_ENVIRONMENT: ${{ matrix.profile }}
         ApplicationHostBaseUrl: http://booking.system
-        Urls: ''
-        ASPNETCORE_URLS: ''
+        Urls: 'http://*:5000'
+        ASPNETCORE_URLS: 'http://*:5000'
           
     - name: Create output dir
       run: mkdir -p ./output/

From 692e6afbb00036bfc2533c32727ed0e2db66a30d Mon Sep 17 00:00:00 2001
From: Nick Evans <2616208+nickevansuk@users.noreply.github.com>
Date: Fri, 22 Nov 2024 09:58:06 +0000
Subject: [PATCH 80/89] Update docker-test-3.yml

---
 .github/workflows/docker-test-3.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-test-3.yml b/.github/workflows/docker-test-3.yml
index e41623cd..e20b84de 100644
--- a/.github/workflows/docker-test-3.yml
+++ b/.github/workflows/docker-test-3.yml
@@ -29,7 +29,7 @@ jobs:
         dotnet run --no-launch-profile --project ./server/Examples/BookingSystem.AspNetCore/BookingSystem.AspNetCore.csproj --configuration Release --no-build &
       env:
         ASPNETCORE_ENVIRONMENT: ${{ matrix.profile }}
-        ApplicationHostBaseUrl: http://booking.system
+        ApplicationHostBaseUrl: http://booking.system:5000
         Urls: 'http://*:5000'
         ASPNETCORE_URLS: 'http://*:5000'
           

From 449c7d1426a64f65e5413480a7d25acdb35fb439 Mon Sep 17 00:00:00 2001
From: Nick Evans <2616208+nickevansuk@users.noreply.github.com>
Date: Fri, 22 Nov 2024 09:59:13 +0000
Subject: [PATCH 81/89] Update docker-test-3.yml

---
 .github/workflows/docker-test-3.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-test-3.yml b/.github/workflows/docker-test-3.yml
index e20b84de..0b2700d4 100644
--- a/.github/workflows/docker-test-3.yml
+++ b/.github/workflows/docker-test-3.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     container:
       image: mcr.microsoft.com/dotnet/sdk:3.1
-      options: --network-alias booking.system --expose 5000
+      options: --network-alias booking.system
     strategy:
       fail-fast: false
       matrix:

From da9c3831efced2fbc221de3bffdab387ad91f0cf Mon Sep 17 00:00:00 2001
From: Nick Evans <2616208+nickevansuk@users.noreply.github.com>
Date: Fri, 22 Nov 2024 10:06:24 +0000
Subject: [PATCH 82/89] Update docker-test-3.yml

---
 .github/workflows/docker-test-3.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-test-3.yml b/.github/workflows/docker-test-3.yml
index 0b2700d4..d72dba41 100644
--- a/.github/workflows/docker-test-3.yml
+++ b/.github/workflows/docker-test-3.yml
@@ -1,7 +1,7 @@
 name: Test using Docker for CI
 on:
   push:
-    branches: [ feature/docker-image ]
+    branches: [ feature/docker-image-4 ]
 
 jobs:
   docker-test:

From 19fe20e7710a05b439267e064601e09afab074f0 Mon Sep 17 00:00:00 2001
From: Nick Evans <2616208+nickevansuk@users.noreply.github.com>
Date: Fri, 22 Nov 2024 10:10:21 +0000
Subject: [PATCH 83/89] Create docker-test-4.yml

---
 .github/workflows/docker-test-4.yml | 53 +++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 .github/workflows/docker-test-4.yml

diff --git a/.github/workflows/docker-test-4.yml b/.github/workflows/docker-test-4.yml
new file mode 100644
index 00000000..67ef59f8
--- /dev/null
+++ b/.github/workflows/docker-test-4.yml
@@ -0,0 +1,53 @@
+name: Test using Docker for CI
+on:
+  push:
+    branches: [ feature/docker-image ]
+
+jobs:
+  docker-test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        mode: ['random']
+        profile: ['no-auth']
+    steps:
+    - name: Setup .NET Core 3.1.419
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 3.1.419
+    - name: Checkout OpenActive.Server.NET
+      uses: actions/checkout@v2
+      with:
+        path: server
+    - name: Install OpenActive.Server.NET dependencies
+      if: ${{ matrix.profile != 'no-auth' && matrix.profile != 'single-seller' }}
+      run: dotnet restore ./server/
+    - name: Build .NET Core Booking Server Reference Implementation
+      run: dotnet build ./server/Examples/BookingSystem.AspNetCore/BookingSystem.AspNetCore.csproj --configuration Release ${{ matrix.profile != 'no-auth' && matrix.profile != 'single-seller' && '--no-restore' || '' }}
+    - name: Start .NET Core Booking Server Reference Implementation
+      run: |
+        dotnet run --no-launch-profile --project ./server/Examples/BookingSystem.AspNetCore/BookingSystem.AspNetCore.csproj --configuration Release --no-build &
+      env:
+        ASPNETCORE_ENVIRONMENT: ${{ matrix.profile }}
+        ApplicationHostBaseUrl: http://host.docker.internal:5000
+        Urls: 'http://*:5000'
+        ASPNETCORE_URLS: 'http://*:5000'
+          
+    - name: Create output dir
+      run: mkdir -p ./output/
+  
+    - name: Run OpenActive Test Suite
+      uses: openactive/openactive-test-suite@master
+      with:
+        NODE_CONFIG: |
+          {"ci": true, "broker": {"outputPath": "/github/workspace/output/", "datasetSiteUrl": "http://host.docker.internal:5000/openactive"}, "integrationTests": { "outputPath": "/github/workspace/output/", "conformanceCertificatePath": "/github/workspace/conformance/examples/${{ matrix.profile }}/${{ matrix.mode }}/", "useRandomOpportunities": ${{ matrix.mode == 'random' }}, "conformanceCertificateId": "https://certificates.reference-implementation.openactive.io/examples/${{ matrix.profile }}/${{ matrix.mode }}/" }}
+        NODE_ENV: .example.${{ matrix.profile }}
+        NODE_APP_INSTANCE: ci
+
+    - name: Upload test output for ${{ matrix.mode }} mode as artifact
+      uses: actions/upload-artifact@v4
+      if: ${{ success() || failure() }}
+      with:
+        name: core.${{ matrix.mode }}.${{ matrix.profile }}
+        path: ./output/

From 731feaea11d87049bdd7929d6279e8a570ed8c4b Mon Sep 17 00:00:00 2001
From: Nick Evans <2616208+nickevansuk@users.noreply.github.com>
Date: Fri, 22 Nov 2024 10:16:11 +0000
Subject: [PATCH 84/89] Update docker-test-4.yml

---
 .github/workflows/docker-test-4.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-test-4.yml b/.github/workflows/docker-test-4.yml
index 67ef59f8..b9c1580e 100644
--- a/.github/workflows/docker-test-4.yml
+++ b/.github/workflows/docker-test-4.yml
@@ -30,7 +30,7 @@ jobs:
         dotnet run --no-launch-profile --project ./server/Examples/BookingSystem.AspNetCore/BookingSystem.AspNetCore.csproj --configuration Release --no-build &
       env:
         ASPNETCORE_ENVIRONMENT: ${{ matrix.profile }}
-        ApplicationHostBaseUrl: http://host.docker.internal:5000
+        ApplicationHostBaseUrl: http://172.17.0.1:5000
         Urls: 'http://*:5000'
         ASPNETCORE_URLS: 'http://*:5000'
           
@@ -41,7 +41,7 @@ jobs:
       uses: openactive/openactive-test-suite@master
       with:
         NODE_CONFIG: |
-          {"ci": true, "broker": {"outputPath": "/github/workspace/output/", "datasetSiteUrl": "http://host.docker.internal:5000/openactive"}, "integrationTests": { "outputPath": "/github/workspace/output/", "conformanceCertificatePath": "/github/workspace/conformance/examples/${{ matrix.profile }}/${{ matrix.mode }}/", "useRandomOpportunities": ${{ matrix.mode == 'random' }}, "conformanceCertificateId": "https://certificates.reference-implementation.openactive.io/examples/${{ matrix.profile }}/${{ matrix.mode }}/" }}
+          {"ci": true, "broker": {"outputPath": "/github/workspace/output/", "datasetSiteUrl": "http://172.17.0.1:5000/openactive"}, "integrationTests": { "outputPath": "/github/workspace/output/", "conformanceCertificatePath": "/github/workspace/conformance/examples/${{ matrix.profile }}/${{ matrix.mode }}/", "useRandomOpportunities": ${{ matrix.mode == 'random' }}, "conformanceCertificateId": "https://certificates.reference-implementation.openactive.io/examples/${{ matrix.profile }}/${{ matrix.mode }}/" }}
         NODE_ENV: .example.${{ matrix.profile }}
         NODE_APP_INSTANCE: ci
 

From a6f978b7bcf781d2736a60430138abd66db84902 Mon Sep 17 00:00:00 2001
From: Nick Evans <2616208+nickevansuk@users.noreply.github.com>
Date: Fri, 22 Nov 2024 14:21:54 +0000
Subject: [PATCH 85/89] Update docker-test-4.yml

---
 .github/workflows/docker-test-4.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-test-4.yml b/.github/workflows/docker-test-4.yml
index b9c1580e..7a1630b9 100644
--- a/.github/workflows/docker-test-4.yml
+++ b/.github/workflows/docker-test-4.yml
@@ -1,7 +1,7 @@
 name: Test using Docker for CI
 on:
   push:
-    branches: [ feature/docker-image ]
+    branches: [ feature/docker-image-4 ]
 
 jobs:
   docker-test:

From 039b530e7b1d2583339f9f0a09b4e76850235ee1 Mon Sep 17 00:00:00 2001
From: Nick Evans <2616208+nickevansuk@users.noreply.github.com>
Date: Fri, 22 Nov 2024 14:23:18 +0000
Subject: [PATCH 86/89] Create docker-test-5.yml

---
 .github/workflows/docker-test-5.yml | 53 +++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 .github/workflows/docker-test-5.yml

diff --git a/.github/workflows/docker-test-5.yml b/.github/workflows/docker-test-5.yml
new file mode 100644
index 00000000..67ef59f8
--- /dev/null
+++ b/.github/workflows/docker-test-5.yml
@@ -0,0 +1,53 @@
+name: Test using Docker for CI
+on:
+  push:
+    branches: [ feature/docker-image ]
+
+jobs:
+  docker-test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        mode: ['random']
+        profile: ['no-auth']
+    steps:
+    - name: Setup .NET Core 3.1.419
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 3.1.419
+    - name: Checkout OpenActive.Server.NET
+      uses: actions/checkout@v2
+      with:
+        path: server
+    - name: Install OpenActive.Server.NET dependencies
+      if: ${{ matrix.profile != 'no-auth' && matrix.profile != 'single-seller' }}
+      run: dotnet restore ./server/
+    - name: Build .NET Core Booking Server Reference Implementation
+      run: dotnet build ./server/Examples/BookingSystem.AspNetCore/BookingSystem.AspNetCore.csproj --configuration Release ${{ matrix.profile != 'no-auth' && matrix.profile != 'single-seller' && '--no-restore' || '' }}
+    - name: Start .NET Core Booking Server Reference Implementation
+      run: |
+        dotnet run --no-launch-profile --project ./server/Examples/BookingSystem.AspNetCore/BookingSystem.AspNetCore.csproj --configuration Release --no-build &
+      env:
+        ASPNETCORE_ENVIRONMENT: ${{ matrix.profile }}
+        ApplicationHostBaseUrl: http://host.docker.internal:5000
+        Urls: 'http://*:5000'
+        ASPNETCORE_URLS: 'http://*:5000'
+          
+    - name: Create output dir
+      run: mkdir -p ./output/
+  
+    - name: Run OpenActive Test Suite
+      uses: openactive/openactive-test-suite@master
+      with:
+        NODE_CONFIG: |
+          {"ci": true, "broker": {"outputPath": "/github/workspace/output/", "datasetSiteUrl": "http://host.docker.internal:5000/openactive"}, "integrationTests": { "outputPath": "/github/workspace/output/", "conformanceCertificatePath": "/github/workspace/conformance/examples/${{ matrix.profile }}/${{ matrix.mode }}/", "useRandomOpportunities": ${{ matrix.mode == 'random' }}, "conformanceCertificateId": "https://certificates.reference-implementation.openactive.io/examples/${{ matrix.profile }}/${{ matrix.mode }}/" }}
+        NODE_ENV: .example.${{ matrix.profile }}
+        NODE_APP_INSTANCE: ci
+
+    - name: Upload test output for ${{ matrix.mode }} mode as artifact
+      uses: actions/upload-artifact@v4
+      if: ${{ success() || failure() }}
+      with:
+        name: core.${{ matrix.mode }}.${{ matrix.profile }}
+        path: ./output/

From dd79c2dd4feeead5909e51808be4fbbb93d6d9d5 Mon Sep 17 00:00:00 2001
From: Nick Evans <2616208+nickevansuk@users.noreply.github.com>
Date: Fri, 22 Nov 2024 14:23:31 +0000
Subject: [PATCH 87/89] Update docker-test-4.yml

---
 .github/workflows/docker-test-4.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-test-4.yml b/.github/workflows/docker-test-4.yml
index 7a1630b9..b9c1580e 100644
--- a/.github/workflows/docker-test-4.yml
+++ b/.github/workflows/docker-test-4.yml
@@ -1,7 +1,7 @@
 name: Test using Docker for CI
 on:
   push:
-    branches: [ feature/docker-image-4 ]
+    branches: [ feature/docker-image ]
 
 jobs:
   docker-test:

From 6d6a4f9b2dffaa359fb48fd2b1c046aa584b4e76 Mon Sep 17 00:00:00 2001
From: Nick Evans <2616208+nickevansuk@users.noreply.github.com>
Date: Fri, 22 Nov 2024 14:23:52 +0000
Subject: [PATCH 88/89] Update docker-test-3.yml

---
 .github/workflows/docker-test-3.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-test-3.yml b/.github/workflows/docker-test-3.yml
index d72dba41..0b2700d4 100644
--- a/.github/workflows/docker-test-3.yml
+++ b/.github/workflows/docker-test-3.yml
@@ -1,7 +1,7 @@
 name: Test using Docker for CI
 on:
   push:
-    branches: [ feature/docker-image-4 ]
+    branches: [ feature/docker-image ]
 
 jobs:
   docker-test:

From 0fd71e9292d67b419ef9c45a3c2d73814286eb84 Mon Sep 17 00:00:00 2001
From: Nick Evans <2616208+nickevansuk@users.noreply.github.com>
Date: Fri, 22 Nov 2024 14:36:26 +0000
Subject: [PATCH 89/89] Update docker-test-5.yml

---
 .github/workflows/docker-test-5.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-test-5.yml b/.github/workflows/docker-test-5.yml
index 67ef59f8..c1d73908 100644
--- a/.github/workflows/docker-test-5.yml
+++ b/.github/workflows/docker-test-5.yml
@@ -35,7 +35,7 @@ jobs:
         ASPNETCORE_URLS: 'http://*:5000'
           
     - name: Create output dir
-      run: mkdir -p ./output/
+      run: mkdir -p ./output/json
   
     - name: Run OpenActive Test Suite
       uses: openactive/openactive-test-suite@master