Remove unnecessary 'six' pythoin compat lib, and unnecessary python2 …

…stuff
gstackio · Dec 3, 2024 · d9119a1 · d9119a1
1 parent 8d0b2a0
commit d9119a1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/gk-ops-image/Dockerfile b/gk-ops-image/Dockerfile
@@ -72,9 +72,6 @@ RUN \
 \
 \
 \
-# pip
- apt-get -y install --no-install-recommends python-pip python-dev python-setuptools && \
-\
 # git-lfs
  apt-get -y install --no-install-recommends git-lfs && \
 \
@@ -88,9 +85,6 @@ RUN \
  apt-get -y install --no-install-recommends "ruby-dev" && \
  gem install cf-uaac --no-ri --no-rdoc && \
 \
-# Ensure latest version of six
- pip install six --upgrade && \
-\
 # Azure Client
  apt-get -y install --no-install-recommends "apt-transport-https" "azure-cli" && \
 \
@@ -113,7 +107,7 @@ RUN \
 
 RUN \
 # Clean up
- apt-get remove -y python-dev apt-transport-https && \
+ apt-get remove -y apt-transport-https && \
  apt-get -y clean && apt-get -y autoremove --purge && \
  #rm -rf /etc/apt/ && \
  rm -rf /tmp/* && \

diff --git a/gk-ops-image/pipeline.yml b/gk-ops-image/pipeline.yml
@@ -390,7 +390,7 @@ jobs:
           cp bosh-cli/bosh-* workspace/bosh
           cp yq/yq_linux_amd64 workspace/yq
           cp tile-config-generator/tile-config-generator-linux workspace/tile-config-generator
-          
+
           cp cf-mgmt/cf-mgmt-linux workspace/cf-mgmt
           cp cf-mgmt/cf-mgmt-config-linux workspace/cf-mgmt-config
           cp bbr/bbr-[0-9]*-linux-amd64 workspace/bbr