Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
greg
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
it-bott-integrasjoner
greg
Commits
c894f959
Commit
c894f959
authored
2 years ago
by
lass
Browse files
Options
Downloads
Patches
Plain Diff
Update harbor url & add settings variable to api
parent
89388fc4
No related branches found
No related tags found
1 merge request
!401
Update harbor url & add settings variable to api
Pipeline
#190357
passed
2 years ago
Stage: venv update
Stage: tests and linting
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
frontend/Containerfile
+2
-2
2 additions, 2 deletions
frontend/Containerfile
gregui/api/serializers/guest.py
+1
-5
1 addition, 5 deletions
gregui/api/serializers/guest.py
with
3 additions
and
7 deletions
frontend/Containerfile
+
2
−
2
View file @
c894f959
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
...
...
This diff is collapsed.
Click to expand it.
gregui/api/serializers/guest.py
+
1
−
5
View file @
c894f959
...
...
@@ -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
()
]
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment