From 2fc3c9350cc653e118c50c9ee494c55891084b57 Mon Sep 17 00:00:00 2001
From: howardlee <lihongweibj@inspur.com>
Date: Fri, 4 Aug 2023 16:46:52 +0800
Subject: Adding db sync script for venus

The script for database synchronization is missing in the venus-api image,
which makes it impossible to create the required database tables during
venus deployment.

Closes-Bug: #2029915
Change-Id: Ibbf75fa73b8397ea3686b42cec6cad6d8f6d3858
(cherry picked from commit 772de9662caa5e2041d557322a9b6a7344b3e0f0)
---
 docker/venus/venus-api/Dockerfile.j2     | 3 +++
 docker/venus/venus-api/extend_start.sh   | 8 ++++++++
 docker/venus/venus-manager/Dockerfile.j2 | 2 --
 3 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 docker/venus/venus-api/extend_start.sh

(limited to 'docker')

diff --git a/docker/venus/venus-api/Dockerfile.j2 b/docker/venus/venus-api/Dockerfile.j2
index a10e55535..c5f1641ee 100644
--- a/docker/venus/venus-api/Dockerfile.j2
+++ b/docker/venus/venus-api/Dockerfile.j2
@@ -5,6 +5,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% block venus_api_header %}{% endblock %}
 
+COPY extend_start.sh /usr/local/bin/kolla_venus_extend_start
+RUN chmod 644 /usr/local/bin/kolla_venus_extend_start
+
 {% block venus_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
diff --git a/docker/venus/venus-api/extend_start.sh b/docker/venus/venus-api/extend_start.sh
new file mode 100644
index 000000000..bbe03bbbc
--- /dev/null
+++ b/docker/venus/venus-api/extend_start.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
+# of the KOLLA_BOOTSTRAP variable being set, including empty.
+if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
+    venus_manager db sync
+    exit 0
+fi
diff --git a/docker/venus/venus-manager/Dockerfile.j2 b/docker/venus/venus-manager/Dockerfile.j2
index 272a905e6..ae7d215df 100644
--- a/docker/venus/venus-manager/Dockerfile.j2
+++ b/docker/venus/venus-manager/Dockerfile.j2
@@ -5,8 +5,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% block venus_manager_header %}{% endblock %}
 
-RUN chmod 644 /usr/local/bin/kolla_venus_extend_start
-
 {% block venus_manager_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
-- 
cgit v1.2.3