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.

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

Add OCNE based k8s tool images that supply helm and kubectl. #2860

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/build-and-push-dev-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ on:
required: false
lang:
description: List of languages to build
default: 'gcc-toolset, golang, nginx, nodejs, php, python, redis, ruby, haproxy'
default: 'gcc-toolset, golang, nginx, nodejs, php, python, redis, ruby, haproxy, kubectl, helm, ocne-tools'
required: false

# Default values for the builds triggered by the push event
env:
ol: 'oraclelinux7, oraclelinux8, oraclelinux9'
lang: 'gcc-toolset, golang, nodejs, nginx, php, python, redis, ruby, haproxy'
lang: 'gcc-toolset, golang, nodejs, nginx, php, python, redis, ruby, haproxy, kubectl, helm, ocne-tools'

jobs:
prepare:
Expand Down
14 changes: 14 additions & 0 deletions OracleLinuxDevelopers/oraclelinux8/helm/3.12/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Copyright (c) 2024 Oracle and/or its affiliates.
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
# OCNE 1.8 - Helm 3.12

FROM ghcr.io/oracle/oraclelinux:8

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

ENTRYPOINT ["helm"]

CMD ["--help"]
14 changes: 14 additions & 0 deletions OracleLinuxDevelopers/oraclelinux8/kubectl/1.28/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Copyright (c) 2024 Oracle and/or its affiliates.
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
# OCNE 1.8 - Kubectl 1.28

FROM ghcr.io/oracle/oraclelinux:8

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

ENTRYPOINT ["kubectl"]

CMD ["--help"]
21 changes: 21 additions & 0 deletions OracleLinuxDevelopers/oraclelinux8/ocne-tools/1.8/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Copyright (c) 2024 Oracle and/or its affiliates.
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
# OCNE 1.8 - Helm 3.12

# 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_olcne18 ol8_addons ol8_baseos_latest ol8_appstream && \
dnf install -y helm kubectl && \
rm -rf /var/cache/dnf

COPY help.sh /opt/help.sh

USER oracle

ENTRYPOINT []

CMD ["/bin/bash", "/opt/help.sh"]
9 changes: 9 additions & 0 deletions OracleLinuxDevelopers/oraclelinux8/ocne-tools/1.8/help.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/bin/bash

echo "OCNE/OKE Tools"

echo "oci-cli version: $(oci --version)"
helm version --template='helm version: {{.Version}}'
echo ''
echo "kubectl versions: "
kubectl version --client
14 changes: 14 additions & 0 deletions OracleLinuxDevelopers/oraclelinux9/helm/3.12/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Copyright (c) 2024 Oracle and/or its affiliates.
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
# OCNE 1.8 - Helm 3.12

FROM ghcr.io/oracle/oraclelinux:9

RUN dnf install -y oracle-olcne-release-el9 && \
dnf config-manager --enable ol9_olcne18 ol9_addons ol9_baseos_latest ol9_appstream && \
dnf install -y helm && \
rm -rf /var/cache/dnf

ENTRYPOINT ["helm"]

CMD ["--help"]
14 changes: 14 additions & 0 deletions OracleLinuxDevelopers/oraclelinux9/kubectl/1.28/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Copyright (c) 2024 Oracle and/or its affiliates.
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
# OCNE 1.8 - Kubectl 1.28

FROM ghcr.io/oracle/oraclelinux:9

RUN dnf install -y oracle-olcne-release-el9 && \
dnf config-manager --enable ol9_olcne18 ol9_addons ol9_baseos_latest ol9_appstream && \
dnf install -y kubectl && \
rm -rf /var/cache/dnf

ENTRYPOINT ["kubectl"]

CMD ["--help"]