Merge pull request #794 from MetaCell/feature/CH-169

Optional image building -- fix test build

Author: filippomc

.gitignore

@@ -8,7 +8,7 @@ node_modules
 *.DS_Store
 deployment/helm
 deployment/compose
-docker-compose.yaml
+/docker-compose.yaml
 *.egg-info
 *.idea
 /build

applications/accounts/.dockerignore

@@ -0,0 +1,4 @@
+/dev
+.ch-manifest
+README.md
+/deploy

applications/accounts/Dockerfile

@@ -1,4 +1,4 @@
-FROM quay.io/keycloak/keycloak:16.1.1
+FROM quay.io/keycloak/keycloak:16.1.0
 
 # add kubectl
 USER root

applications/accounts/deploy/resources/realm.json

@@ -44,12 +44,18 @@
         "resetPasswordAllowed": true,
         "editUsernameAllowed": true,
         "users": [
+            {{- $j := 0}}
             {{- range $app := .Values.apps }}
               {{- if (hasKey $app.harness "accounts")  }}
+                {{- if $j}},{{end}}
+                {{- if len $app.harness.accounts.users}}
+                    {{- $j = add1 $j }}
+                {{- end }}
                 {{- range $i, $user := $app.harness.accounts.users }}{{if $i}},{{end}}
                 {{ include "deploy_accounts_utils.user" (dict "root" $ "app" $app "user" $user) }}
                 {{- end }}
               {{- end }}
+              
             {{- end }}
         ],
         "roles": {
@@ -82,14 +88,18 @@
                 }
             ],
             "client": {
+            {{- $k := 0}}
             {{- range $app := .Values.apps }}
+
               {{- if (hasKey $app.harness "accounts")  }}
+                {{- if $k}},{{end}}
                 {{ $app.harness.name | quote }}: [
                 {{- range $i, $role := $app.harness.accounts.roles }}
                 {{if $i}},{{end}}
-                {{ include "deploy_accounts_utils.role" (dict "root" $ "app" $app "role" $role) }}
+                {{- include "deploy_accounts_utils.role" (dict "root" $ "app" $app "role" $role) }}
                 {{- end }}
                 ]
+                {{- $k = add1 $k }}
               {{- end }}
             {{- end }}
             }

applications/accounts/deploy/values-test.yaml

@@ -0,0 +1,20 @@
+  accounts:
+    roles:
+    - role1
+    - role2
+    - role3
+    users:
+    - username: sample@testuser.com
+      clientRoles:
+      - role1
+      realmRoles:
+      - administrator
+      - offline_access
+    - username: samples-test-user2
+      email: sample2@testuser.com
+      password: test1
+      clientRoles:
+      - role1
+      realmRoles:
+      - offline_access
+

applications/accounts/deploy/values.yaml

@@ -11,7 +11,7 @@ harness:
         cpu: "10m"
       limits:
         memory: "1024Mi"
-        cpu: "500m"
+        cpu: "2000m"
   service:
     auto: true
     port: 8080

applications/accounts/dev/disable-theme-cache.cli

@@ -0,0 +1,5 @@
+embed-server --std-out=echo --server-config=standalone-ha.xml
+/subsystem=keycloak-server/theme=defaults/:write-attribute(name=cacheThemes,value=false)
+/subsystem=keycloak-server/theme=defaults/:write-attribute(name=cacheTemplates,value=false)
+/subsystem=keycloak-server/theme=defaults/:write-attribute(name=staticMaxAge,value=-1)
+stop-embedded-server

applications/accounts/dev/docker-compose.yaml

@@ -0,0 +1,45 @@
+version: '3.2'
+
+services:
+  postgres:
+      image: postgres
+      environment:
+        POSTGRES_DB: keycloak
+        POSTGRES_USER: keycloak
+        POSTGRES_PASSWORD: password
+        PGDATA: /var/lib/postgresql/data/pgdata
+      volumes:
+        - pg_data:/var/lib/postgresql/data/pgdata
+
+  keycloak:
+      image: quay.io/keycloak/keycloak:16.1.1
+      environment:
+        DB_VENDOR: POSTGRES
+        DB_ADDR: postgres
+        DB_DATABASE: keycloak
+        DB_USER: keycloak
+        DB_SCHEMA: public
+        DB_PASSWORD: password
+        KEYCLOAK_USER: admin
+        KEYCLOAK_PASSWORD: Pa55w0rd
+
+      ports:
+        - 8080:8080
+      depends_on:
+        - postgres
+      volumes:
+        - type: bind
+          source: ../themes/custom
+          target: /opt/jboss/keycloak/themes/custom
+        # disable cache
+        - type: bind
+          source: ./disable-theme-cache.cli
+          target: /opt/jboss/startup-scripts/disable-theme-cache.cli
+        - type: bind
+          source: ../scripts/create_api_user.sh
+          target: /opt/jboss/startup-scripts/create_api_user.sh
+        - type: bind
+          source: ../plugins/metacell-admin-event-listener-bundle-1.0.0.ear
+          target: /opt/jboss/keycloak/standalone/deployments/metacell-admin-event-listener-bundle-1.0.0.ear
+volumes:
+  pg_data: