From 1ac2dfdf164b18cc8756c75779a23791d974aa7d Mon Sep 17 00:00:00 2001
From: jkuensem <jkuensem@physik.uni-bielefeld.de>
Date: Fri, 31 Jan 2020 18:41:44 +0100
Subject: [PATCH] TMSS-138: Modify docker compose setup for testenv to include
OIDC test provider
---
SAS/TMSS/docker/tmss-testenv/docker-compose.yml | 7 +++++++
SAS/TMSS/docker/tmss-testenv/nginx.conf | 4 ++++
SAS/TMSS/docker/tmss-testenv/tmss_testenv_Dockerfile | 2 +-
.../oidcprovider/management/commands/createuser.py | 3 +++
4 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/SAS/TMSS/docker/tmss-testenv/docker-compose.yml b/SAS/TMSS/docker/tmss-testenv/docker-compose.yml
index a0aff9ea3ab..6fff3a0338b 100644
--- a/SAS/TMSS/docker/tmss-testenv/docker-compose.yml
+++ b/SAS/TMSS/docker/tmss-testenv/docker-compose.yml
@@ -15,4 +15,11 @@ services:
container_name: tmss_test_nginx
ports:
- "5005:5005"
+ tmss_test_oidc:
+ build:
+ context: ../../test/oidc/docker-test-mozilla-django-oidc/
+ dockerfile: dockerfiles/oidc_testprovider
+ container_name: tmss_test_oidc
+ ports:
+ - "8088:8088"
diff --git a/SAS/TMSS/docker/tmss-testenv/nginx.conf b/SAS/TMSS/docker/tmss-testenv/nginx.conf
index 66d9a68ca35..2bf331144da 100644
--- a/SAS/TMSS/docker/tmss-testenv/nginx.conf
+++ b/SAS/TMSS/docker/tmss-testenv/nginx.conf
@@ -40,5 +40,9 @@ http {
proxy_pass http://tmss_test:8008;
}
+ location /openid/ {
+ proxy_pass http://tmss_test_oidc:8088;
+ }
+
}
}
\ No newline at end of file
diff --git a/SAS/TMSS/docker/tmss-testenv/tmss_testenv_Dockerfile b/SAS/TMSS/docker/tmss-testenv/tmss_testenv_Dockerfile
index ba62c365dbb..43fb3c6b42a 100644
--- a/SAS/TMSS/docker/tmss-testenv/tmss_testenv_Dockerfile
+++ b/SAS/TMSS/docker/tmss-testenv/tmss_testenv_Dockerfile
@@ -21,7 +21,7 @@ ENV PATH=$PATH:/usr/pgsql-9.4/bin/
RUN echo "Checking out code base" && \
git clone https://git.astron.nl/ro/lofar.git && \
cd lofar && \
- git checkout TMSS-134 && \
+ git checkout master && \
. CMake/gen_LofarPackageList_cmake.sh && \
PACKAGE=TMSS && \
VARIANT=gnucxx11_opt && \
diff --git a/SAS/TMSS/test/oidc/docker-test-mozilla-django-oidc/testprovider/oidcprovider/management/commands/createuser.py b/SAS/TMSS/test/oidc/docker-test-mozilla-django-oidc/testprovider/oidcprovider/management/commands/createuser.py
index 11fc496c521..76eb780c1f5 100644
--- a/SAS/TMSS/test/oidc/docker-test-mozilla-django-oidc/testprovider/oidcprovider/management/commands/createuser.py
+++ b/SAS/TMSS/test/oidc/docker-test-mozilla-django-oidc/testprovider/oidcprovider/management/commands/createuser.py
@@ -17,11 +17,13 @@ class Command(BaseCommand):
parser.add_argument("username", help="account username")
parser.add_argument("password", help="account password")
parser.add_argument("email", help="account email address")
+ parser.add_argument("groups", help="account user groups", nargs='*')
def handle(self, **options):
username = options["username"]
password = options["password"]
email = options["email"]
+ groups = options["groups"]
if User.objects.filter(username=username).exists():
self.stdout.write("User {} already exists.".format(username))
@@ -29,5 +31,6 @@ class Command(BaseCommand):
user = User.objects.create(username=username, email=email)
user.set_password(password)
+ user.groups.set(groups)
user.save()
self.stdout.write("User {} created.".format(username))
--
GitLab