Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

NMS-16576: Stop including ALEC in containers #7520

Open
wants to merge 4 commits into
base: foundation-2024
Choose a base branch
from
Open

NMS-16576: Stop including ALEC in containers #7520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ae83c6f
Update plugins.sh
Umairk95 Nov 7, 2024
4d579aa
Update Dockerfile
Umairk95 Nov 7, 2024
7c6bbb5
Update Dockerfile
Umairk95 Nov 7, 2024
4fbb148
Update Dockerfile
Umairk95 Nov 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions opennms-container/core/plugins.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
set -euo pipefail
IFS=$'\n\t'

export ALEC_VERSION="latest"
export CORTEX_VERSION="latest"
export VELOCLOUD_VERSION="latest"

Expand All @@ -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
Expand Down
9 changes: 0 additions & 9 deletions opennms-container/sentinel/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Loading