Merge branch 'main' into feature/support-http3

ls1intum · Dec 12, 2023 · bebae62 · bebae62
2 parents ab5b4c9 + 5f1d325
commit bebae62
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/roles/artemis/tasks/docker_deploy_artemis.yml b/roles/artemis/tasks/docker_deploy_artemis.yml
@@ -23,6 +23,19 @@
   register: permissions
   notify: restart docker artemis
 
+- name: Set permissions for postgres directory
+  become: true
+  file:
+    path: "{{ artemis_working_directory }}/data/database"
+    state: directory
+    recurse: yes
+    # Must match UID and GID used for the postgres user
+    # See e.g. https://hub.docker.com/layers/library/postgres/16.1-alpine/images/sha256-b788d196db04847b17df664f4ae18062e712328d225b9ff75d4d7cd91a16c374?context=explore
+    owner: "70"
+    group: "70"
+  when: artemis_database_type == "postgresql"
+  notify: restart docker artemis
+
 - name: Copy docker.env to artemis directory
   become: true
   template:

diff --git a/roles/artemis/templates/artemis-docker.sh.j2 b/roles/artemis/templates/artemis-docker.sh.j2
@@ -5,7 +5,7 @@ PROJECT_DIR="{{ artemis_working_directory }}/Artemis/docker"
 {% set localci_compose_file = "test-server-" + artemis_database_type + "-localci.yml" %}
 {% set multi_node_localci_compose_file = "test-server-multi-node-" + artemis_database_type + "-localci.yml" %}
 
-COMPOSE_FILE="{% if continuous_integration.localci is defined and is_multinode_install is defined %}{{ multi_node_localci_compose_file }}{% elif continuous_integration.localci is defined %}{{ localci_compose_file }}{% else %}{{ default_compose_file }}{% endif %}"
+COMPOSE_FILE="{% if continuous_integration.localci is defined and is_multinode_install is defined and is_multinode_install %}{{ multi_node_localci_compose_file }}{% elif continuous_integration.localci is defined %}{{ localci_compose_file }}{% else %}{{ default_compose_file }}{% endif %}"
 ENV_FILE="{{ artemis_working_directory }}/docker.env"
 {% if continuous_integration.localci is defined %}
 export DOCKER_GROUP_ID=$(getent group docker | cut -d: -f3)

diff --git a/roles/artemis/templates/docker.env.j2 b/roles/artemis/templates/docker.env.j2
@@ -16,9 +16,11 @@ DATABASE_ENV_FILE='{{ artemis_working_directory }}/database.env'
 DATABASE_VOLUME_MOUNT='{{ artemis_working_directory }}/data/database'
 
 # Broker & Registry vars
+{% if is_multinode_install %}
 REGISTRY_PASSWORD='{{ artemis_jhipster_registry_password }}'
 BROKER_USER='{{ broker.username }}'
 BROKER_PASSWORD='{{ broker.password }}'
+{% endif %}
 
 # Nginx vars
 NGINX_PROXY_SSL_CERTIFICATE_PATH='{{ proxy_ssl_certificate_path }}'