From c894f9592a43caba8c9e050dd1415612d8462aed Mon Sep 17 00:00:00 2001
From: Lasse Fredheim <lass@uio.no>
Date: Wed, 8 Mar 2023 16:31:40 +0100
Subject: [PATCH] Update harbor url & add settings variable to api
---
frontend/Containerfile | 4 ++--
gregui/api/serializers/guest.py | 6 +-----
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/frontend/Containerfile b/frontend/Containerfile
index c718237e..ac95ddb8 100644
--- a/frontend/Containerfile
+++ b/frontend/Containerfile
@@ -1,4 +1,4 @@
-FROM harbor.uio.no/library/docker.io-node:16-alpine as build-stage
+FROM harbor.uio.no/mirrors/docker.io/library/node:16-alpine as build-stage
LABEL org.opencontainers.image.authors="bnt-int@usit.uio.no"
LABEL no.uio.contact="bnt-int@usit.uio.no"
@@ -12,7 +12,7 @@ RUN cd /app/ && npm ci && npm run build:no-env
### Final image
-FROM harbor.uio.no/library/docker.io-nginx:latest
+FROM harbor.uio.no/mirrors/docker.io/library/nginx:latest
# Install various utilities
# jq is needed for the docker entrypoint
diff --git a/gregui/api/serializers/guest.py b/gregui/api/serializers/guest.py
index 851adcf6..d18f56ff 100644
--- a/gregui/api/serializers/guest.py
+++ b/gregui/api/serializers/guest.py
@@ -316,11 +316,7 @@ class FrontPageGuestSerializer(serializers.ModelSerializer):
[
x
for x in obj.identities.all()
- if x.type
- in [
- Identity.IdentityType.NORWEGIAN_NATIONAL_ID_NUMBER,
- Identity.IdentityType.PASSPORT_NUMBER,
- ]
+ if x.type in settings.ALLOWED_VERIFIED_ID_TYPES
and x.verified_at
and x.verified_at <= timezone.now()
]
--
GitLab