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 · 2023-04-03 17:15:11 +02:00
5 changed files with 11 additions and 15 deletions
--- a/debian/control
+++ b/debian/control
@ -11,4 +11,4 @@ Vcs-Browser: https://forge.cadoles.com/wpetit/goweb-oidc
 Package: mse-oidc-demo
 Architecture: all
 Depends: ${misc:Depends}, docker.io, docker-compose
-Description: Application de démo oidc MSE
+Description: Démo OIDC pour MSE
--- a/debian/mse-oidc-demo.service
+++ b/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

--- a/debian/rules
+++ b/debian/rules
@ -5,5 +5,9 @@
 #export DH_VERBOSE=1

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

--- a/debian/source/format
+++ b/debian/source/format
@ -1 +0,0 @@
-3.0 (native)
--- 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
Matthieu Lamalle	7303ed2439	update rules and systemd	2023-04-03 17:15:11 +02:00
Matthieu Lamalle	b5c0711778	override_dh_auto_test	2023-04-03 17:04:26 +02:00
Matthieu Lamalle	acfe8ab38e	override_dh_build	2023-04-03 17:01:04 +02:00
Matthieu Lamalle	b47a6ddd02	override_dh_auto_build	2023-04-03 16:58:34 +02:00
Matthieu Lamalle	6193646609	add debian packaging	2023-04-03 16:54:53 +02:00
wpetit	927fdbce47	Merge pull request 'Ajout paramètre pour définir l'acr_value' (#3 ) from acr_values into master Reviewed-on: wpetit/goweb-oidc#3	2023-03-02 16:33:06 +01:00