From 5e4869c46b545ab962427f68975521fbbd4e7dfd Mon Sep 17 00:00:00 2001
From: ttuovinen <teemu.t.tuovinen@gmail.com>
Date: Wed, 24 Jan 2024 09:42:55 +0200
Subject: [PATCH] Switch to ekirjasto-circulation-admin package

...and revert to The Palace Project's circ-baseimage for now
---
 api/admin/config.py | 6 ++----
 docker/Dockerfile   | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/api/admin/config.py b/api/admin/config.py
index 3cc7d6d27..4d4f60337 100644
--- a/api/admin/config.py
+++ b/api/admin/config.py
@@ -16,10 +16,8 @@ class OperationalMode(str, Enum):
 
 class Configuration(LoggerMixin):
     APP_NAME = "E-kirjasto Collection Manager"
-    # PACKAGE_NAME = "@natlibfi/ekirjasto-circulation-admin"
-    # PACKAGE_VERSION = "0.0.1"
-    PACKAGE_NAME = "@thepalaceproject/circulation-admin"
-    PACKAGE_VERSION = "1.11.0"
+    PACKAGE_NAME = "@natlibfi/ekirjasto-circulation-admin"
+    PACKAGE_VERSION = "0.0.1"
 
     STATIC_ASSETS = {
         "admin_js": "circulation-admin.js",
diff --git a/docker/Dockerfile b/docker/Dockerfile
index f83c39bd2..c7c2bbb29 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -6,7 +6,7 @@
 # The only difference are what services are enabled.
 ###############################################################################
 
-ARG BASE_IMAGE=ghcr.io/natlibfi/ekirjasto-circ-baseimage:latest
+ARG BASE_IMAGE=ghcr.io/thepalaceproject/circ-baseimage:latest
 
 FROM ${BASE_IMAGE} AS common