Merge branch 'master' into dist/debian/bullseye/master

debian/mse-oidc-demo.service

@@ -7,9 +7,9 @@ StartLimitInterval=0
 [Service]
 Type=simple
 WorkingDirectory=/srv/mse-oidc-demo/
-ExecStart=docker-compose up
+ExecStart=/usr/bin/docker-compose up
+ExecStop=/usr/bin/docker-compose down
 Restart=always
-StartLimitIntervalSec=0
 User=root
 Group=root
 

debian/rules

@@ -5,5 +5,9 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@
+	dh $@ --with systemd
+
+override_dh_auto_build:
+
+override_dh_auto_test:
 

docker-compose.yml

@@ -1,24 +1,17 @@
 version: "2.4"
 services:
   oidc-test:
-    build:
+    image: reg.cadoles.com/cadoles/goweb-oidc-test
-      context: ./
-      dockerfile: ./misc/dokku/Dockerfile
-      args:
-        - HTTP_PROXY=${HTTP_PROXY:-}
-        - HTTPS_PROXY=${HTTPS_PROXY:-}
-        - http_proxy=${http_proxy:-}
-        - https_proxy=${https_proxy:-}
     environment:
       - LOG_LEVEL=0
       - HTTP_ADDRESS=0.0.0.0:3002
       - OIDC_CLIENT_ID=local-test
       - OIDC_CLIENT_SECRET=local-test
-      - OIDC_ISSUER_URL=https://msedev.crous-toulouse.fr/auth/
+      - OIDC_ISSUER_URL=
       - OIDC_REDIRECT_URL=http://localhost:3002
       - OIDC_POST_LOGOUT_REDIRECT_URL=http://localhost:3002
       - OIDC_ACR_VALUES=
     ports:
-      - 3002:3002
+      - 80:3002
     network_mode: host