Merge pull request #9 from meshcloud/feature/keycloak2

Feature/keycloak2

Author: florianow

.github/actions/setup-nix-shell/action.yml

@@ -8,7 +8,7 @@ outputs: {}
 runs:
   using: "composite"
   steps:
-    - uses: nixbuild/nix-quick-install-action@v26
+    - uses: nixbuild/nix-quick-install-action@v34
       with:
         # gh actions runners have 16 GiB of memory by default, we happily trade some of that for a significant speedup
         # of nix install (empirically this cut install times from from 75s to 30s when introduced)

.pre-commit-config.yaml

@@ -49,4 +49,4 @@ repos:
     rev: v2.12.0
     hooks:
       - id: hadolint-docker
-        args: ['--ignore', 'DL3008', '--ignore', 'DL3009', '--ignore', 'DL3018']
+        args: ['--ignore', 'DL3008', '--ignore', 'DL3009', '--ignore', 'DL3018', '--ignore', 'DL3015', '--ignore', 'DL4006', '--ignore', 'DL3025', '--ignore', 'SC2028']

Caddyfile.azure

@@ -73,10 +73,6 @@
         header_up Accept-Encoding identity
     }
 
-    replace {
-        "http://localhost:8083" "https://testminio.germanywestcentral.cloudapp.azure.com:8444"
-    }
-
     log {
         output stdout
         format json

README.md

@@ -304,7 +304,7 @@ No modules.
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
 | <a name="input_allowed_ip_addresses"></a> [allowed\_ip\_addresses](#input\_allowed\_ip\_addresses) | Comma-separated list of IP addresses that will be allowed to access the MinIO service in CIDR format. Example: '203.0.113.0/32' for a single IP or '10.10.10.2/32,192.168.1.0/24' for multiple IPs. | `string` | `"10.10.10.2/32"` | no |
-| <a name="input_coraza_waf_image"></a> [coraza\_waf\_image](#input\_coraza\_waf\_image) | Coraza WAF container image | `string` | `"ghcr.io/meshcloud/minio_azure_container_app/coraza-caddy:caddy-2.8-coraza-v2.0.0"` | no |
+| <a name="input_coraza_waf_image"></a> [coraza\_waf\_image](#input\_coraza\_waf\_image) | Coraza WAF container image | `string` | `"ghcr.io/meshcloud/minio_azure_container_app/coraza-caddy:caddy-2.9.1-coraza-v2.0.0"` | no |
 | <a name="input_keycloak_admin_password"></a> [keycloak\_admin\_password](#input\_keycloak\_admin\_password) | Keycloak admin password | `string` | n/a | yes |
 | <a name="input_keycloak_admin_user"></a> [keycloak\_admin\_user](#input\_keycloak\_admin\_user) | Keycloak admin username | `string` | `"admin"` | no |
 | <a name="input_keycloak_test_user_email"></a> [keycloak\_test\_user\_email](#input\_keycloak\_test\_user\_email) | Keycloak test user email | `string` | `"[email protected]"` | no |

docker-compose/opk-providers-azure/providers

@@ -536,9 +536,8 @@ resource "azurerm_container_group" "minio_aci_container_group" {
       KC_BOOTSTRAP_ADMIN_USERNAME       = var.keycloak_admin_user
       KC_BOOTSTRAP_ADMIN_PASSWORD       = var.keycloak_admin_password
       KC_HTTP_ENABLED                   = "true"
-      KC_HOSTNAME_STRICT                = "false"
-      KC_HOSTNAME_URL                   = "https://${azurerm_public_ip.agw_pip.fqdn}:8444"
-      KC_HOSTNAME_ADMIN_URL             = "https://${azurerm_public_ip.agw_pip.fqdn}:8444"
+      KC_HOSTNAME                       = "https://${azurerm_public_ip.agw_pip.fqdn}:8444"
+      KC_HOSTNAME_BACKCHANNEL_DYNAMIC   = "true"
       KC_PROXY_HEADERS                  = "xforwarded"
       KC_PROXY                          = "edge"
       KEYCLOAK_IMPORT                   = "/opt/keycloak/data/import/minio-realm-config.json"

main.tf

@@ -70,7 +70,7 @@ variable "nginx_image" {
 
 variable "coraza_waf_image" {
   type        = string
-  default     = "ghcr.io/meshcloud/minio_azure_container_app/coraza-caddy:caddy-2.8-coraza-v2.0.0"
+  default     = "ghcr.io/meshcloud/minio_azure_container_app/coraza-caddy:caddy-2.9.1-coraza-v2.0.0"
   description = "Coraza WAF container image"
 }