Update zmbuilder for 9.0.0.p36
This commit is contained in:
parent
c0b3cbf1d8
commit
5dba23e1ce
|
@ -2,7 +2,7 @@ FROM almalinux:8
|
|||
MAINTAINER Daniel Berteaud <dbd@ehtrace.com>
|
||||
|
||||
ARG ZM_VERSION=9.0.0 \
|
||||
ZM_PATCH=35
|
||||
ZM_PATCH=36
|
||||
|
||||
ENV ZM_VERSION=${ZM_VERSION} \
|
||||
ZM_PATCH=${ZM_PATCH}
|
||||
|
|
|
@ -38,7 +38,10 @@ get_repo_branch() {
|
|||
|
||||
|
||||
echo Creating needed directories
|
||||
mkdir -p /zimbra/tgz/${ZM_VERSION}/p${ZM_PATCH}
|
||||
mkdir -p /zimbra/tgz/${ZM_VERSION}/
|
||||
if [[ "${ZM_VERSION}" =~ ^9 ]]; then
|
||||
mkdir -p /zimbra/tgz/${ZM_VERSION}/p${ZM_PATCH}
|
||||
fi
|
||||
mkdir -p /zimbra/repo/${ZM_VERSION}/el8/{SRPMS,x86_64,noarch}
|
||||
|
||||
cd /work
|
||||
|
@ -82,4 +85,8 @@ echo Copy repo dir
|
|||
rsync -rtvP --del /work/.staging/RHEL8_64*/zm-packages/bundle/r8/ /zimbra/repo/${ZM_VERSION}/el8/x86_64/
|
||||
|
||||
echo Copy install tarball
|
||||
mv /work/BUILDS/RHEL8_64*/zcs-${ZM_VERSION}*.tgz /zimbra/tgz/${ZM_VERSION}/p${ZM_PATCH}/
|
||||
if [[ "${ZM_VERSION}" =~ ^9 ]]; then
|
||||
mv /work/BUILDS/RHEL8_64*/zcs-${ZM_VERSION}*.tgz /zimbra/tgz/${ZM_VERSION}/p${ZM_PATCH}/
|
||||
elif [[ "${ZM_VERSION}" =~ ^10 ]]; then
|
||||
mv /work/BUILDS/RHEL8_64*/zcs-${ZM_VERSION}*.tgz /zimbra/tgz/${ZM_VERSION}/
|
||||
fi
|
||||
|
|
|
@ -0,0 +1,20 @@
|
|||
--- install.sh.orig 2023-09-13 22:39:01.155761114 +0200
|
||||
+++ install.sh 2023-09-13 22:39:08.909858697 +0200
|
||||
@@ -325,17 +325,6 @@
|
||||
exit 0
|
||||
fi
|
||||
|
||||
-# Install the zimbra-ldap-patch
|
||||
-isInstalled zimbra-ldap
|
||||
-if [ x$PKGINSTALLED != "x" ]; then
|
||||
- echo "Installing zimbra-ldap-patch"
|
||||
- $REPOINST zimbra-ldap-patch >>$LOGFILE 2>&1
|
||||
- if [ $? -ne 0 ]; then
|
||||
- echo "Failed to install zimbra-ldap-patch"
|
||||
- exit 1
|
||||
- fi
|
||||
-fi
|
||||
-
|
||||
#
|
||||
# Installation complete, now configure
|
||||
#
|
Loading…
Reference in New Issue