diff --git a/opennms-container/core/plugins.sh b/opennms-container/core/plugins.sh index bb3b3f7c188a..16070db5c22c 100755 --- a/opennms-container/core/plugins.sh +++ b/opennms-container/core/plugins.sh @@ -3,7 +3,6 @@ set -euo pipefail IFS=$'\n\t' -export ALEC_VERSION="latest" export CORTEX_VERSION="latest" export VELOCLOUD_VERSION="latest" @@ -14,18 +13,6 @@ mkdir -p "$DEPLOY_FOLDER" microdnf -y install cpio python3-pip jq pip3 install --upgrade cloudsmith-cli -mkdir ~/test -cd ~/test || exit -artifact_urls=$(cloudsmith list packages --query="opennms-alec-plugin version:$ALEC_VERSION format:rpm" opennms/common -F json | jq -r '.data[].cdn_url') -for url in $artifact_urls; do - curl -sS -L -O "$url" -done -rpm2cpio *-alec-plugin*.rpm | cpio -id -find . -name '*.kar' -exec mv '{}' "$DEPLOY_FOLDER" \; - -cd ~/ || exit -rm -rf test - cd "$DEPLOY_FOLDER" || exit if [ "$CORTEX_VERSION" == "latest" ] then diff --git a/opennms-container/sentinel/Dockerfile b/opennms-container/sentinel/Dockerfile index 2ce4dd70e105..df49c3a30b18 100644 --- a/opennms-container/sentinel/Dockerfile +++ b/opennms-container/sentinel/Dockerfile @@ -54,13 +54,6 @@ SHELL ["/bin/bash", "-c"] RUN microdnf -y install ${REQUIRED_RPMS} && \ rm -rf /var/cache/yum -## -# Download plugins -## -FROM ${BASE_IMAGE} as sentinel-plugins - -COPY plugins.sh /tmp/plugins.sh -RUN chmod +x /tmp/plugins.sh && cd /tmp && ./plugins.sh && rm ./plugins.sh ## # Install and setup OpenNMS Sentinel @@ -71,8 +64,6 @@ FROM sentinel-base # We would have 755 for sentinel:root instead of 775 and prevents writing lock files in /usr/share/sentinel COPY --chown=10001:0 --from=sentinel-tarball /opt/usr-share /usr/share -COPY --chown=10001:0 --from=sentinel-plugins /opt/usr-plugins /usr/share/opennms/deploy - SHELL ["/bin/bash", "-c"] # Create Sentinel user with a specific group ID