before release

javanile · Mar 12, 2021 · 5418d41 · 5418d41
1 parent a3f983c
commit 5418d41
Show file tree

Hide file tree

Showing 13 changed files with 24 additions and 15 deletions.
diff --git a/6.1.0-Beta/Dockerfile b/6.1.0-Beta/Dockerfile
@@ -45,7 +45,7 @@ RUN vtiger-install.sh --install-mysql --assert-mysql --dump --remove-mysql && \
 
 COPY config.inc.php /usr/src/vtiger/
 COPY LoggerManager.php /var/www/html/libraries/log4php/
-COPY config.performance.php loading.php /var/www/html/
+COPY config.performance.php health.php loading.php  /var/www/html/
 COPY crontab /etc/
 
 VOLUME ["/var/lib/vtiger"]

diff --git a/6.1.0/Dockerfile b/6.1.0/Dockerfile
@@ -45,7 +45,7 @@ RUN vtiger-install.sh --install-mysql --assert-mysql --dump --remove-mysql && \
 
 COPY config.inc.php /usr/src/vtiger/
 COPY LoggerManager.php /var/www/html/libraries/log4php/
-COPY config.performance.php loading.php /var/www/html/
+COPY config.performance.php health.php loading.php  /var/www/html/
 COPY crontab /etc/
 
 VOLUME ["/var/lib/vtiger"]

diff --git a/6.2.0/Dockerfile b/6.2.0/Dockerfile
@@ -45,7 +45,7 @@ RUN vtiger-install.sh --install-mysql --assert-mysql --dump --remove-mysql && \
 
 COPY config.inc.php /usr/src/vtiger/
 COPY LoggerManager.php /var/www/html/libraries/log4php/
-COPY config.performance.php loading.php /var/www/html/
+COPY config.performance.php health.php loading.php  /var/www/html/
 COPY crontab /etc/
 
 VOLUME ["/var/lib/vtiger"]

diff --git a/6.3.0/Dockerfile b/6.3.0/Dockerfile
@@ -45,7 +45,7 @@ RUN vtiger-install.sh --install-mysql --assert-mysql --dump --remove-mysql && \
 
 COPY config.inc.php /usr/src/vtiger/
 COPY LoggerManager.php /var/www/html/libraries/log4php/
-COPY config.performance.php loading.php /var/www/html/
+COPY config.performance.php health.php loading.php  /var/www/html/
 COPY crontab /etc/
 
 VOLUME ["/var/lib/vtiger"]

diff --git a/6.4.0/Dockerfile b/6.4.0/Dockerfile
@@ -45,7 +45,7 @@ RUN vtiger-install.sh --install-mysql --assert-mysql --dump --remove-mysql && \
 
 COPY config.inc.php /usr/src/vtiger/
 COPY LoggerManager.php /var/www/html/libraries/log4php/
-COPY config.performance.php loading.php /var/www/html/
+COPY config.performance.php health.php loading.php  /var/www/html/
 COPY crontab /etc/
 
 VOLUME ["/var/lib/vtiger"]

diff --git a/6.5.0/Dockerfile b/6.5.0/Dockerfile
@@ -45,7 +45,7 @@ RUN vtiger-install.sh --install-mysql --assert-mysql --dump --remove-mysql && \
 
 COPY config.inc.php /usr/src/vtiger/
 COPY LoggerManager.php /var/www/html/libraries/log4php/
-COPY config.performance.php loading.php /var/www/html/
+COPY config.performance.php health.php loading.php  /var/www/html/
 COPY crontab /etc/
 
 VOLUME ["/var/lib/vtiger"]

diff --git a/7.0.0/Dockerfile b/7.0.0/Dockerfile
@@ -45,7 +45,7 @@ RUN vtiger-install.sh --install-mysql --assert-mysql --dump --remove-mysql && \
 
 COPY config.inc.php /usr/src/vtiger/
 COPY LoggerManager.php /var/www/html/libraries/log4php/
-COPY config.performance.php loading.php /var/www/html/
+COPY config.performance.php health.php loading.php  /var/www/html/
 COPY crontab /etc/
 
 VOLUME ["/var/lib/vtiger"]

diff --git a/7.0.1/Dockerfile b/7.0.1/Dockerfile
@@ -45,7 +45,7 @@ RUN vtiger-install.sh --install-mysql --assert-mysql --dump --remove-mysql && \
 
 COPY config.inc.php /usr/src/vtiger/
 COPY LoggerManager.php /var/www/html/libraries/log4php/
-COPY config.performance.php loading.php /var/www/html/
+COPY config.performance.php health.php loading.php  /var/www/html/
 COPY crontab /etc/
 
 VOLUME ["/var/lib/vtiger"]

diff --git a/7.1.0-RC/Dockerfile b/7.1.0-RC/Dockerfile
@@ -45,7 +45,7 @@ RUN vtiger-install.sh --install-mysql --assert-mysql --dump --remove-mysql && \
 
 COPY config.inc.php /usr/src/vtiger/
 COPY LoggerManager.php /var/www/html/libraries/log4php/
-COPY config.performance.php loading.php /var/www/html/
+COPY config.performance.php health.php loading.php  /var/www/html/
 COPY crontab /etc/
 
 VOLUME ["/var/lib/vtiger"]

diff --git a/7.1.0/Dockerfile b/7.1.0/Dockerfile
@@ -46,7 +46,7 @@ RUN cd /var/www/html/vtlib/Vtiger/ && \
 
 COPY config.inc.php /usr/src/vtiger/
 COPY LoggerManager.php /var/www/html/libraries/log4php/
-COPY config.performance.php loading.php /var/www/html/
+COPY config.performance.php health.php loading.php  /var/www/html/
 COPY crontab /etc/
 
 VOLUME ["/var/lib/vtiger"]

diff --git a/7.2.0/Dockerfile b/7.2.0/Dockerfile
@@ -45,7 +45,7 @@ RUN vtiger-install.sh --install-mysql --assert-mysql --dump --remove-mysql && \
 
 COPY config.inc.php /usr/src/vtiger/
 COPY LoggerManager.php /var/www/html/libraries/log4php/
-COPY config.performance.php loading.php /var/www/html/
+COPY config.performance.php health.php loading.php  /var/www/html/
 COPY crontab /etc/
 
 VOLUME ["/var/lib/vtiger"]

diff --git a/Dockerfile.main.template b/Dockerfile.main.template
@@ -37,8 +37,10 @@ RUN cd /usr/src/vtiger && \
 RUN apt-get clean && rm -rf /tmp/* /var/tmp/* /var/lib/apt/lists/*
 
 ## @block: develop
-#COPY develop-install.sh /usr/local/bin/
-#RUN develop-install.sh
+COPY develop-install.sh /usr/local/bin/
+RUN develop-install.sh
+
+
 #COPY vtiger-install.sh /usr/local/bin/
 #COPY vtiger-install.php /usr/src/vtiger/
 ## @block: release
@@ -59,7 +61,7 @@ RUN cd /var/www/html/vtlib/Vtiger/ && \
 
 COPY config.inc.php /usr/src/vtiger/
 COPY LoggerManager.php /var/www/html/libraries/log4php/
-COPY config.performance.php loading.php /var/www/html/
+COPY config.performance.php health.php loading.php  /var/www/html/
 COPY crontab /etc/
 
 VOLUME ["/var/lib/vtiger"]

diff --git a/update.sh b/update.sh
@@ -3,6 +3,8 @@ set -e
 
 source versions.sh
 
+develop_version=${1:-nope}
+
 files=(
     .symvol
     000-default.conf
@@ -47,7 +49,12 @@ for version in "${!versions[@]}"; do
         -e 's!%%PHP_VERSION%%!'"${php_version}"'!' \
         -ri ${version}/Dockerfile
 
-    if [[ "$1" != "${version}" ]]; then
+    if [[ "${version}" == "${develop_version}" ]]; then
+        sed -e ':a;N;$!ba;s!\#\${DEVELOP_LAYER}\n!!g' -ri ${version}/Dockerfile
+        sed -e ':a;N;$!ba;s!\#\${RELEASE_LAYER}\n\#!## RELEASE LAYER: !g' -ri ${version}/Dockerfile
+    else
+        sed -e ':a;N;$!ba;s!\#\${RELEASE_LAYER}\n\#!!g' -ri ${version}/Dockerfile
+        sed -e ':a;N;$!ba;s!\#\${DEVELOP_LAYER}\n!## DEVELOP LAYER: !g' -ri ${version}/Dockerfile
         sed -e ':a;N;$!ba;s!ENV LAYER_BREAK=true\n!!g' -ri ${version}/Dockerfile
         sed -e ':a;N;$!ba;s!\${LAYER_BREAK}\nRUN!\\\n   !g' -ri ${version}/Dockerfile
     fi