From 78f04d161fdfb8aac449fd91540bfbe33a89b378 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20-=20Le=20Filament?= <theo@le-filament.com>
Date: Thu, 21 Nov 2024 16:47:53 +0100
Subject: [PATCH] fix: copy custom SSH config in container only if exists
---
tasks/main.yml | 1 +
templates/Dockerfile.j2 | 2 ++
2 files changed, 3 insertions(+)
diff --git a/tasks/main.yml b/tasks/main.yml
index e26159f..155fedb 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -182,6 +182,7 @@
- "odoo_config"
- "odoo_config_dockerfile"
vars:
+ template_custom_ssh_config: "{{ git_ssh_private_keys is defined }}"
template_odoo_instance: "{{ odoo_instance }}"
template_odoo_instance_setup: "{{ odoo_instance_setup }}"
ansible.builtin.template:
diff --git a/templates/Dockerfile.j2 b/templates/Dockerfile.j2
index f46824c..a40c369 100644
--- a/templates/Dockerfile.j2
+++ b/templates/Dockerfile.j2
@@ -9,8 +9,10 @@ LABEL stage=builder
USER root
+{% if template_custom_ssh_config %}
# Install GitLab private keys
COPY ./dot_ssh/* /root/.ssh
+{% endif %}
# Add addons.
ARG SAVE_COMMITS_FILENAME='custom_addons'
--
GitLab