From f223ea224d75349cd18bb2b1c323b60b9b1c2390 Mon Sep 17 00:00:00 2001
From: Oliver <oliver.henry.walters@gmail.com>
Date: Tue, 28 Jun 2022 13:47:10 +1000
Subject: [PATCH] Docker requirements update (#3266)

* Pin mariadb package <= 1.1.0

- Recent update to 1.1.2 requires newer version of mariadb connector

* Change <= to <
---
 .github/workflows/docker.yaml | 4 +++-
 docker/requirements.txt       | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
index d0fa06b5ff..3b5edbb074 100644
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -39,9 +39,11 @@ jobs:
           python3 ci/version_check.py
           echo "git_commit_hash=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
           echo "git_commit_date=$(git show -s --format=%ci)" >> $GITHUB_ENV
-      - name: Run Unit Tests
+      - name: Build Docker Image
         run: |
           docker-compose build
+      - name: Run Unit Tests
+        run: |
           docker-compose run inventree-dev-server invoke update
           docker-compose up -d
           docker-compose run inventree-dev-server invoke wait
diff --git a/docker/requirements.txt b/docker/requirements.txt
index dced6c0a5f..019fa58ab4 100644
--- a/docker/requirements.txt
+++ b/docker/requirements.txt
@@ -9,7 +9,7 @@ invoke>=1.4.0                   # Invoke build tool
 psycopg2>=2.9.1
 mysqlclient>=2.0.3
 pgcli>=3.1.0
-mariadb>=1.0.7
+mariadb>=1.0.7,<1.1.0
 
 # gunicorn web server
 gunicorn>=20.1.0