Skip to content

Add OCNE 2 tool images. #2998

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+31 −0
Open

Add OCNE 2 tool images. #2998

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 20 additions & 0 deletions OracleLinuxDevelopers/oraclelinux8/ocne-tools/2.0/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Copyright (c) 2024 Oracle and/or its affiliates.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be 2025

# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.

# hadolint ignore=DL3007
FROM ghcr.io/oracle/oci-cli:latest

USER root

RUN dnf install -y oracle-olcne-release-el8 && \
dnf config-manager --enable ol8_ocne ol8_addons ol8_baseos_latest ol8_appstream && \
dnf install -y helm kubectl && \
rm -rf /var/cache/dnf

COPY help.sh /opt/help.sh
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should probably either be /help.sh or /usr/local/bin/help.sh


USER oracle

ENTRYPOINT []
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be removeed.


CMD ["/bin/bash", "/opt/help.sh"]
11 changes: 11 additions & 0 deletions OracleLinuxDevelopers/oraclelinux8/ocne-tools/2.0/help.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/bin/bash
# Copyright (c) 2024 Oracle and/or its affiliates.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be 2025

# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.

echo "OCNE/OKE Tools"

echo "oci-cli version: $(oci --version)"
helm version --template='helm version: {{.Version}}'
echo ''
echo "kubectl versions: "
kubectl version --client
Comment on lines +7 to +11
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suggest storing each version in a variable first, then printing them, ie. something like:

OCI_CLI_VERSION="$(oci --version)"
HELM_VERSION="$(helm version)"
KUBECTL_VERSION="$(kubectl version --client)"

echo "oci-cli version: $OCI_CLI_VERSION"
echo "helm version: $HELM_VERSION"
echo "kubectl version: $KUBECTL_VERSION"

It would be better to use printf but I can't recall the exact syntax off the top of my head. :)