Merge pull request #467 from salopensource/saml

Fixes for the saml image

.github/workflows/build-saml-latest.yml

@@ -29,6 +29,6 @@ jobs:
       uses: docker/[email protected]
       with:
         context: saml
-        file: saml/Dockerfile.pristine
+        file: saml/Dockerfile
         push: true
         tags: ghcr.io/salopensource/sal-saml:latest

.github/workflows/build-saml-release.yml

@@ -29,5 +29,5 @@ jobs:
       with:
         context: saml
         push: true
-        file: saml/Dockerfile.pristine
+        file: saml/Dockerfile
         tags: ghcr.io/salopensource/sal-saml:${{  github.ref_name }}

Dockerfile

@@ -1,8 +1,6 @@
 # Sal Dockerfile
 FROM python:3.9.19-slim-bullseye
 
-MAINTAINER Graham Gilbert <[email protected]>
-
 ENV HOME /root
 ENV DEBIAN_FRONTEND noninteractive
 ENV APPNAME Sal
@@ -69,8 +67,8 @@ RUN chmod 755 /run.sh && \
     touch $APP_DIR/sal.log &&\
     chmod 777 $APP_DIR/sal.log
 
-    #&& \
-    #find . -name $APP_DIR/\*.pyc -delete
+#&& \
+#find . -name $APP_DIR/\*.pyc -delete
 
 WORKDIR $APP_DIR
 EXPOSE 8000

sal/urls.py

@@ -6,27 +6,33 @@
 from django.urls import path, include
 
 admin.autodiscover()
-
-urlpatterns = [
-    path('login/', auth_views.LoginView.as_view(), name='login'),
-    path('logout/', auth_views.logout_then_login, name='logout_then_login'),
-    path('changepassword/', auth_views.PasswordChangeView.as_view(), name='password_change'),
-    path('changepassword/done/', auth_views.PasswordChangeDoneView.as_view(),
-         name='password_change_done'),
-    path('', include('server.urls')),
-    path('admin/doc/', include('django.contrib.admindocs.urls')),
-    path('admin/', admin.site.urls),
-    path('api/', include('api.v1.urls')),
-    path('api/v1/', include('api.v1.urls')),
-    path('api/v2/', include('api.v2.urls')),
-    path('inventory/', include('inventory.urls')),
-    path('search/', include('search.urls')),
-    path('licenses/', include('licenses.urls')),
-    path('catalog/', include('catalog.urls')),
-    path('profiles/', include('profiles.urls')),
-    path('healthcheck/', include('health_check.urls')),
-
+urlpatterns = []
+urlpatterns += [
+    path("login/", auth_views.LoginView.as_view(), name="login"),
+    path("logout/", auth_views.logout_then_login, name="logout_then_login"),
+    path(
+        "changepassword/",
+        auth_views.PasswordChangeView.as_view(),
+        name="password_change",
+    ),
+    path(
+        "changepassword/done/",
+        auth_views.PasswordChangeDoneView.as_view(),
+        name="password_change_done",
+    ),
+    path("", include("server.urls")),
+    path("admin/doc/", include("django.contrib.admindocs.urls")),
+    path("admin/", admin.site.urls),
+    path("api/", include("api.v1.urls")),
+    path("api/v1/", include("api.v1.urls")),
+    path("api/v2/", include("api.v2.urls")),
+    path("inventory/", include("inventory.urls")),
+    path("search/", include("search.urls")),
+    path("licenses/", include("licenses.urls")),
+    path("catalog/", include("catalog.urls")),
+    path("profiles/", include("profiles.urls")),
+    path("healthcheck/", include("health_check.urls")),
 ]
 
 if settings.DEBUG:
-    urlpatterns.append(path('static/<path>', views.serve))
+    urlpatterns.append(path("static/<path>", views.serve))

sal/version.plist

@@ -3,6 +3,6 @@
 <plist version="1.0">
 <dict>
 	<key>version</key>
-	<string>4.3.0.2298</string>
+	<string>4.3.0.2299</string>
 </dict>
 </plist>