From: Matthew Newton <matthew-git@newtoncomputing.co.uk>
Date: Thu, 23 Mar 2023 16:25:38 +0000 (+0000)
Subject: CI: use local copies of Docker images
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7de8b194b8596dca638e9873e3a292a87e18f8b9;p=thirdparty%2Ffreeradius-server.git

CI: use local copies of Docker images
---

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 86396db36fb..697dbdb9133 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -36,6 +36,7 @@ jobs:
     outputs:
       should_skip: ${{ steps.skip_check.outputs.should_skip }}
       selfhosted: ${{ github.repository_owner == 'FreeRADIUS' && '1' || '0' }}
+      docker_prefix: ${{ github.repository_owner == 'FreeRADIUS' && 'docker.internal.networkradius.com/' || '' }}
     steps:
       - id: skip_check
         uses: fkirc/skip-duplicate-actions@master
@@ -99,7 +100,7 @@ jobs:
     #  we need to run separate database containers to provide these.
     services:
       mariadb:
-        image: mariadb
+        image: ${{ needs.pre-ci.outputs.docker_prefix }}mariadb
         env:
           MARIADB_ALLOW_EMPTY_ROOT_PASSWORD: yes
         ports:
@@ -111,7 +112,7 @@ jobs:
           --health-retries 10
 
       postgres:
-        image: postgres
+        image: ${{ needs.pre-ci.outputs.docker_prefix }}postgres
         env:
           POSTGRES_HOST_AUTH_METHOD: trust
         ports:
@@ -123,7 +124,7 @@ jobs:
           --health-retries 5
 
       threeds:
-        image: 4teamwork/389ds
+        image: ${{ needs.pre-ci.outputs.docker_prefix }}4teamwork/389ds
         ports:
           - 3389:3389
           - 3636:3636