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

update docker compose
2023-04-04 09:04:37 +02:00 · 2023-04-04 09:04:04 +02:00 · 2023-04-03 17:20:10 +02:00 · 2023-04-03 17:19:53 +02:00 · 2023-04-03 17:19:18 +02:00
2 changed files with 4 additions and 11 deletions
--- a/debian/rules
+++ b/debian/rules
@ -5,7 +5,7 @@
 #export DH_VERBOSE=1

 %:
-	dh $@ --with-systemd
+	dh $@ --with systemd

 override_dh_auto_build:

--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -1,24 +1,17 @@
 version: "2.4"
 services:
  oidc-test:
-    build:
-      context: ./
-      dockerfile: ./misc/dokku/Dockerfile
-      args:
-        - HTTP_PROXY=${HTTP_PROXY:-}
-        - HTTPS_PROXY=${HTTPS_PROXY:-}
-        - http_proxy=${http_proxy:-}
-        - https_proxy=${https_proxy:-}
+    image: reg.cadoles.com/cadoles/goweb-oidc-test
    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
Author	SHA1	Message	Date
Matthieu Lamalle	43d3d72011	Merge branch 'master' into dist/debian/bullseye/master	2023-04-04 09:04:37 +02:00
Matthieu Lamalle	475b237bad	update docker compose	2023-04-04 09:04:04 +02:00
Matthieu Lamalle	ccd229a466	Merge branch 'master' into dist/debian/bullseye/master	2023-04-03 17:20:10 +02:00
Matthieu Lamalle	4a993cbe15	update rules	2023-04-03 17:19:53 +02:00
Matthieu Lamalle	d2bb13d2bb	update compose	2023-04-03 17:19:18 +02:00