fix7

build-images.sh

@@ -95,15 +95,16 @@ buildah add ${container} ${PWD}/zfaker/wrappers/php /usr/share/webtop/bin/php
 buildah add ${container} ${PWD}/zfaker/wrappers/z-push-admin-wapper /usr/share/webtop/bin/z-push-admin-wrapper
 buildah add ${container} ${pecbridge_tmp_dir}/pecbridge /usr/share/pecbridge
 buildah add ${container} ${PWD}/webapp/ /
-ls -l .
-echo "checking for tmce: $tmce_jar"
-if [ -f $tmce_jar ]; then
-    echo "Adding tmce plugin $tmce_jar.gpg"
-    # Encrypt the jar with 'subscription' password using gpg
-    gpg --batch --yes --passphrase 'subscription' -c $tmce_jar
-    # Decrypt the jar with 'subscription' password using gpg
-    buildah add ${container} ${PWD}/$tmce_jar.gpg /usr/local/tomcat/webapps/webtop/WEB-INF/lib/webtop-tmceplugins.jar.gpg
-fi
+
+
+# Download tmce plugin jar
+tmce_jar_url="https://distfeed.nethserver.org/webtop/webtop-tmceplugins-6.3.1.0.jar.gpg"
+tmce_jar_path="${PWD}/webtop-tmceplugins-6.3.1.0.jar.gpg"
+
+echo "Downloading encrypted tmce plugin jar from ${tmce_jar_url}..."
+curl --fail -L -o "${tmce_jar_path}" "${tmce_jar_url}"
+# Add the encrypted plugin to the image, decrypt password is 'subscription'
+buildah add ${container} "${tmce_jar_path}" /usr/local/tomcat/webapps/webtop/WEB-INF/lib/webtop-tmceplugins.jar.gpg
 # Commit the image
 buildah commit --rm "${container}" "${repobase}/${reponame}"