diff options
| author | Shane McDonald <me@shanemcd.com> | 2021-04-23 15:15:15 +0200 |
|---|---|---|
| committer | Shane McDonald <me@shanemcd.com> | 2021-04-23 15:15:15 +0200 |
| commit | 146fb720dbb23975d1c27b5df381269fd9ec5929 (patch) | |
| tree | 8f3d105c4dc183ec8308c623950242d0c2063866 /tools/ansible | |
| parent | Merge pull request #9993 from chrismeyersfsu/fix-gather_analytics_first_time_run (diff) | |
| download | awx-146fb720dbb23975d1c27b5df381269fd9ec5929.tar.xz awx-146fb720dbb23975d1c27b5df381269fd9ec5929.zip | |
Stop installing kubectl/oc
These are no longer needed with Container Groups v2 under Receptor
Diffstat (limited to 'tools/ansible')
| -rw-r--r-- | tools/ansible/roles/dockerfile/templates/Dockerfile.j2 | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/tools/ansible/roles/dockerfile/templates/Dockerfile.j2 b/tools/ansible/roles/dockerfile/templates/Dockerfile.j2 index ab2964b728..ca5a247830 100644 --- a/tools/ansible/roles/dockerfile/templates/Dockerfile.j2 +++ b/tools/ansible/roles/dockerfile/templates/Dockerfile.j2 @@ -107,10 +107,6 @@ RUN dnf -y update && \ dnf -y install centos-release-stream && dnf -y install "rsyslog >= 8.1911.0" && dnf -y remove centos-release-stream && \ dnf -y clean all -# Install kubectl -RUN curl -L -o /usr/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.17.8/bin/linux/{{ kubectl_architecture | default('amd64') }}/kubectl && \ - chmod a+x /usr/bin/kubectl - RUN curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 && \ chmod 700 get_helm.sh && \ ./get_helm.sh @@ -123,11 +119,6 @@ RUN python3.8 -m ensurepip && pip3 install "virtualenv < 20" supervisor RUN rm -rf /root/.cache && rm -rf /tmp/* -# Install OpenShift CLI -RUN cd /usr/local/bin && \ - curl -L https://github.com/openshift/origin/releases/download/v3.11.0/openshift-origin-client-tools-v3.11.0-0cbc58b-linux-64bit.tar.gz | \ - tar -xz --strip-components=1 --wildcards --no-anchored 'oc' - {% if (build_dev|bool) or (kube_dev|bool) %} # Install development/test requirements RUN dnf -y install \ |