cloud-toolbox: remove oc tool, add openstack dns zone pkg
This commit is contained in:
parent
5e1e39d123
commit
74c6acc044
2 changed files with 9 additions and 16 deletions
|
@ -1,4 +1,4 @@
|
|||
FROM registry.fedoraproject.org/fedora:39
|
||||
FROM registry.fedoraproject.org/fedora-minimal:39
|
||||
|
||||
USER root
|
||||
|
||||
|
@ -12,18 +12,12 @@ ENV VERIFY_CHECKSUM="false"
|
|||
ENV PKGS_BASE="fzf git python3-pip rclone rsync bash-completion kubernetes-client golang-sigs-k8s-kustomize"
|
||||
ENV PKGS_TEMP="python3-devel gcc wget"
|
||||
|
||||
RUN dnf clean all && \
|
||||
dnf install -y ${PKGS_BASE} ${PKGS_TEMP} && \
|
||||
pip3 install python-openstackclient python-swiftclient python-heatclient && \
|
||||
wget https://github.com/openshift/origin/releases/download/v3.11.0/openshift-origin-client-tools-v3.11.0-0cbc58b-linux-64bit.tar.gz && \
|
||||
tar -xvf openshift-origin-client-tools-v3.11.0-0cbc58b-linux-64bit.tar.gz && \
|
||||
chmod +x openshift-origin-client-tools-v3.11.0-0cbc58b-linux-64bit/* && \
|
||||
mv openshift-origin-client-tools-v3.11.0-0cbc58b-linux-64bit/oc /usr/bin/ && \
|
||||
rm -rf openshift-origin-client-tools-v3.11.0-0cbc58b-linux-64bit* && \
|
||||
RUN dnf5 install -y ${PKGS_BASE} ${PKGS_TEMP} && \
|
||||
pip3 install python-openstackclient python-swiftclient python-heatclient python-designateclient && \
|
||||
curl -o /dev/stdout https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash - && \
|
||||
dnf remove -y ${PKGS_TEMP} && \
|
||||
dnf -y autoremove && \
|
||||
dnf -y clean all && \
|
||||
dnf5 remove -y ${PKGS_TEMP} && \
|
||||
dnf5 -y autoremove && \
|
||||
dnf5 -y clean all && \
|
||||
mkdir /data
|
||||
|
||||
WORKDIR /data
|
||||
|
|
|
@ -1,8 +1,7 @@
|
|||
FROM registry.fedoraproject.org/fedora:rawhide
|
||||
FROM registry.fedoraproject.org/fedora-minimal:rawhide
|
||||
|
||||
RUN dnf clean all && \
|
||||
dnf install -y tor nyx util-linux && \
|
||||
dnf clean all
|
||||
RUN dnf5 install -y tor nyx util-linux && \
|
||||
dnf5 clean all
|
||||
|
||||
COPY torrc.conf /torrc
|
||||
|
||||
|
|
Loading…
Reference in a new issue