diff --git a/applications/accounts/deploy/values.yaml b/applications/accounts/deploy/values.yaml index 5c3f0a26..5581c33e 100644 --- a/applications/accounts/deploy/values.yaml +++ b/applications/accounts/deploy/values.yaml @@ -86,7 +86,7 @@ admin: user: admin role: administrator editUsernameAllowed: true -useEvents: false +useEvents: true identityProviders: - github - google @@ -94,4 +94,4 @@ theme: login: "keycloak" account: "keycloak" admin: "keycloak" - email: "keycloak" \ No newline at end of file + email: "keycloak" diff --git a/tools/deployment-cli-tools/ch_cli_tools/configurationgenerator.py b/tools/deployment-cli-tools/ch_cli_tools/configurationgenerator.py index ed521650..f1f6eff6 100644 --- a/tools/deployment-cli-tools/ch_cli_tools/configurationgenerator.py +++ b/tools/deployment-cli-tools/ch_cli_tools/configurationgenerator.py @@ -328,17 +328,17 @@ def image_tag(self, image_name, build_context_path=None, dependencies=()): logging.info(f"Ignoring {ignore}") tag = generate_tag_from_content(build_context_path, ignore) logging.info(f"Content hash: {tag}") - + # Get dependencies from build context if not provided dependencies = dependencies or guess_build_dependencies_from_dockerfile(build_context_path) - + # Combine with dependency tags dep_tags = "".join(self.all_images.get(n, '') for n in dependencies) if dep_tags: logging.info(f"Dependency tags: {[(n, self.all_images.get(n, '')) for n in dependencies]}") tag = sha1((tag + dep_tags).encode("utf-8")).hexdigest() logging.info(f"Generated tag (with dependencies): {tag}") - + app_name = image_name.split("/")[-1] # the image name can have a prefix self.all_images[app_name] = tag return self.registry + image_name + (f':{tag}' if tag else '')