From 1beba0a957199809d6a0c28ef06246d1c8278fbf Mon Sep 17 00:00:00 2001
From: mjanez <96422458+mjanez@users.noreply.github.com>
Date: Thu, 8 Feb 2024 12:35:43 +0100
Subject: [PATCH 1/2] Revert to 3.11-slim vulnerability fixed version

Unstable 3.13:
https://github.com/python-poetry/poetry/issues/8557
---
 ckan-mqa/Dockerfile     | 2 +-
 ckan-mqa/Dockerfile.dev | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ckan-mqa/Dockerfile b/ckan-mqa/Dockerfile
index 183a03a..6095d7c 100644
--- a/ckan-mqa/Dockerfile
+++ b/ckan-mqa/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.13.0a3-slim
+FROM python:3.11-slim
 LABEL maintainer="mnl.janez@gmail.com"
 
 ENV APP_DIR=/app
diff --git a/ckan-mqa/Dockerfile.dev b/ckan-mqa/Dockerfile.dev
index ac4dec0..e31cea2 100644
--- a/ckan-mqa/Dockerfile.dev
+++ b/ckan-mqa/Dockerfile.dev
@@ -1,4 +1,4 @@
-FROM python:3.13.0a3-slim
+FROM python:3.11-slim
 LABEL maintainer="mnl.janez@gmail.com"
 
 ENV APP_DIR=/app

From bc6b05412ecfdea1713e0b6e97a51d94bdfba2c1 Mon Sep 17 00:00:00 2001
From: mjanez <96422458+mjanez@users.noreply.github.com>
Date: Thu, 8 Feb 2024 12:35:59 +0100
Subject: [PATCH 2/2] Fix branch name in actions

---
 .github/workflows/docker-pr.yaml | 2 +-
 .github/workflows/docker.yaml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-pr.yaml b/.github/workflows/docker-pr.yaml
index a1e147e..277d66d 100644
--- a/.github/workflows/docker-pr.yaml
+++ b/.github/workflows/docker-pr.yaml
@@ -3,7 +3,7 @@ name: Test ckan-mqa images (PR)
 on:
   pull_request:
     branches:
-        - master
+        - main
         - 'ckan-mqa-*.*.*'
         - '!dev/ckan-mqa-*.*.*'
         - '!feature/*'
diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
index 8e5c167..9876020 100644
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -5,7 +5,7 @@ on:
     types:
         - closed
     branches:
-        - master
+        - main
         - 'ckan-mqa-*.*.*'
         - '!dev/ckan-mqa-*.*.*'
         - '!feature/*'