chore: use no-install-recommends when installing deb packages in test…

… images Signed-off-by: Pratik Raj <[email protected]> Co-authored-by: Daniel Azuma <[email protected]>
googleapis · Sep 9, 2020 · 5b05f64 · 5b05f64
1 parent 982b12c
commit 5b05f64
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 21 deletions.
diff --git a/.kokoro/docker/autosynth/Dockerfile b/.kokoro/docker/autosynth/Dockerfile
@@ -17,12 +17,12 @@ FROM ubuntu:bionic
 ENTRYPOINT /bin/bash
 
 # Set the locale
-RUN apt-get update && apt-get install -y --no-install-recommends locales && rm -rf /var/lib/apt/lists/* \
+RUN apt-get update && apt-get --no-install-recommends install -y locales && rm -rf /var/lib/apt/lists/* \
     && localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
 ENV LANG en_US.utf8
 
 # Install dependencies
-RUN apt-get update && apt-get install -y git curl autoconf bison build-essential libssl1.0-dev \
+RUN apt-get update && apt-get --no-install-recommends install -y git curl autoconf bison build-essential libssl1.0-dev \
     libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev libffi-dev libgdbm5 libgdbm-dev \
     make libbz2-dev libreadline-dev libsqlite3-dev wget xz-utils liblzma-dev apt-transport-https \
     ca-certificates software-properties-common
@@ -83,6 +83,6 @@ RUN nodenv global 10.16.3
 RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -
 RUN add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu bionic stable"
 RUN apt-get update
-RUN apt-get install -y docker-ce
+RUN apt-get --no-install-recommends install -y docker-ce
 
 RUN apt-get -y autoremove && apt-get -y autoclean
diff --git a/.kokoro/docker/multi-node/Dockerfile b/.kokoro/docker/multi-node/Dockerfile
@@ -1,4 +1,4 @@
 FROM gcr.io/cloud-devrel-kokoro-resources/yoshi-ruby/multi as ruby_base
 
 RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
-RUN apt-get update && apt-get -y upgrade && apt-get install -y nodejs
+RUN apt-get update && apt-get -y upgrade && apt-get --no-install-recommends install -y nodejs
diff --git a/.kokoro/docker/multi/Dockerfile b/.kokoro/docker/multi/Dockerfile
@@ -3,12 +3,12 @@ FROM ubuntu:bionic
 ENTRYPOINT /bin/bash
 
 # Set the locale
-RUN apt-get update && apt-get install -y --no-install-recommends locales && rm -rf /var/lib/apt/lists/* \
+RUN apt-get update && apt-get --no-install-recommends install -y locales && rm -rf /var/lib/apt/lists/* \
     && localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
 ENV LANG en_US.utf8
 
 # Install dependencies
-RUN apt-get update && apt-get install -y git curl autoconf bison build-essential libssl1.0-dev \
+RUN apt-get update && apt-get --no-install-recommends install -y git curl autoconf bison build-essential libssl1.0-dev \
     libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev libffi-dev libgdbm5 libgdbm-dev \
     freetds-dev freetds-bin imagemagick pkg-config libmagickwand-dev
 RUN apt-get -y autoclean

diff --git a/.kokoro/docker/release/Dockerfile b/.kokoro/docker/release/Dockerfile
@@ -3,12 +3,12 @@ FROM ubuntu:bionic
 ENTRYPOINT /bin/bash
 
 # Set the locale
-RUN apt-get update && apt-get install -y --no-install-recommends locales && rm -rf /var/lib/apt/lists/* \
+RUN apt-get update && apt-get --no-install-recommends install -y locales && rm -rf /var/lib/apt/lists/* \
     && localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
 ENV LANG en_US.utf8
 
 # Install dependencies
-RUN apt-get update && apt-get install -y git curl autoconf bison build-essential libssl1.0-dev \
+RUN apt-get update && apt-get --no-install-recommends install -y git curl autoconf bison build-essential libssl1.0-dev \
     libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev libffi-dev libgdbm5 libgdbm-dev \
     make libbz2-dev libreadline-dev wget llvm libncursesw5-dev xz-utils liblzma-dev python-openssl \
     sqlite3 libsqlite3-dev

diff --git a/.kokoro/templates/autosynth.Dockerfile.erb b/.kokoro/templates/autosynth.Dockerfile.erb
@@ -17,12 +17,12 @@ FROM ubuntu:bionic
 ENTRYPOINT /bin/bash
 
 # Set the locale
-RUN apt-get update && apt-get install -y --no-install-recommends locales && rm -rf /var/lib/apt/lists/* \
+RUN apt-get update && apt-get --no-install-recommends install -y locales && rm -rf /var/lib/apt/lists/* \
     && localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
 ENV LANG en_US.utf8
 
 # Install dependencies
-RUN apt-get update && apt-get install -y git curl autoconf bison build-essential libssl1.0-dev \
+RUN apt-get update && apt-get --no-install-recommends install -y git curl autoconf bison build-essential libssl1.0-dev \
     libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev libffi-dev libgdbm5 libgdbm-dev \
     make libbz2-dev libreadline-dev libsqlite3-dev wget xz-utils liblzma-dev apt-transport-https \
     ca-certificates software-properties-common
@@ -83,6 +83,6 @@ RUN nodenv global 10.16.3
 RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -
 RUN add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu bionic stable"
 RUN apt-get update
-RUN apt-get install -y docker-ce
+RUN apt-get --no-install-recommends install -y docker-ce
 
 RUN apt-get -y autoremove && apt-get -y autoclean
diff --git a/.kokoro/templates/multi.Dockerfile.erb b/.kokoro/templates/multi.Dockerfile.erb
@@ -3,12 +3,12 @@ FROM ubuntu:bionic
 ENTRYPOINT /bin/bash
 
 # Set the locale
-RUN apt-get update && apt-get install -y --no-install-recommends locales && rm -rf /var/lib/apt/lists/* \
+RUN apt-get update && apt-get --no-install-recommends install -y locales && rm -rf /var/lib/apt/lists/* \
     && localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
 ENV LANG en_US.utf8
 
 # Install dependencies
-RUN apt-get update && apt-get install -y git curl autoconf bison build-essential libssl1.0-dev \
+RUN apt-get update && apt-get --no-install-recommends install -y git curl autoconf bison build-essential libssl1.0-dev \
     libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev libffi-dev libgdbm5 libgdbm-dev \
     freetds-dev freetds-bin imagemagick pkg-config libmagickwand-dev
 RUN apt-get -y autoclean

diff --git a/.kokoro/templates/release.Dockerfile.erb b/.kokoro/templates/release.Dockerfile.erb
@@ -3,12 +3,12 @@ FROM ubuntu:bionic
 ENTRYPOINT /bin/bash
 
 # Set the locale
-RUN apt-get update && apt-get install -y --no-install-recommends locales && rm -rf /var/lib/apt/lists/* \
+RUN apt-get update && apt-get --no-install-recommends install -y locales && rm -rf /var/lib/apt/lists/* \
     && localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
 ENV LANG en_US.utf8
 
 # Install dependencies
-RUN apt-get update && apt-get install -y git curl autoconf bison build-essential libssl1.0-dev \
+RUN apt-get update && apt-get --no-install-recommends install -y git curl autoconf bison build-essential libssl1.0-dev \
     libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev libffi-dev libgdbm5 libgdbm-dev \
     make libbz2-dev libreadline-dev wget llvm libncursesw5-dev xz-utils liblzma-dev python-openssl \
     sqlite3 libsqlite3-dev

diff --git a/Vagrantfile b/Vagrantfile
@@ -5,11 +5,11 @@ $grpc = <<SCRIPT
 # Install grps
 echo "deb http://http.debian.net/debian jessie-backports main" | sudo tee -a /etc/apt/sources.list
 sudo apt-get update -y
-sudo apt-get install libgrpc-dev -y --force-yes
+sudo apt-get --no-install-recommends install libgrpc-dev -y --force-yes
 SCRIPT
 
 $gcloud = <<SCRIPT
-sudo apt-get install curl -y
+sudo apt-get --no-install-recommends install curl -y
 curl https://sdk.cloud.google.com | bash
 SCRIPT
 
@@ -22,7 +22,7 @@ rvm install ruby-2.3
 rvm --default use 2.3
 
 # Install git and bundler and grpc gem
-sudo apt-get install git -y
+sudo apt-get --no-install-recommends install git -y
 gem install --no-document bundler grpc
 SCRIPT
 

diff --git a/integration/rails4_app/Dockerfile.example b/integration/rails4_app/Dockerfile.example
@@ -17,7 +17,7 @@ ARG REQUESTED_RUBY_VERSION=""
 RUN if test -n "$REQUESTED_RUBY_VERSION" -a \
         ! -x /rbenv/versions/$REQUESTED_RUBY_VERSION/bin/ruby; then \
       (apt-get update -y \
-        && apt-get install -y -q gcp-ruby-$REQUESTED_RUBY_VERSION) \
+        && apt-get --no-install-recommends install -y -q gcp-ruby-$REQUESTED_RUBY_VERSION) \
       || (cd /rbenv/plugins/ruby-build \
         && git pull \
         && rbenv install -s $REQUESTED_RUBY_VERSION) \

diff --git a/integration/rails5_app/Dockerfile.example b/integration/rails5_app/Dockerfile.example
@@ -17,7 +17,7 @@ ARG REQUESTED_RUBY_VERSION=""
 RUN if test -n "$REQUESTED_RUBY_VERSION" -a \
         ! -x /rbenv/versions/$REQUESTED_RUBY_VERSION/bin/ruby; then \
       (apt-get update -y \
-        && apt-get install -y -q gcp-ruby-$REQUESTED_RUBY_VERSION) \
+        && apt-get --no-install-recommends install -y -q gcp-ruby-$REQUESTED_RUBY_VERSION) \
       || (cd /rbenv/plugins/ruby-build \
         && git pull \
         && rbenv install -s $REQUESTED_RUBY_VERSION) \

diff --git a/integration/sinatra2_app/Dockerfile.example b/integration/sinatra2_app/Dockerfile.example
@@ -17,7 +17,7 @@ ARG REQUESTED_RUBY_VERSION=""
 RUN if test -n "$REQUESTED_RUBY_VERSION" -a \
         ! -x /rbenv/versions/$REQUESTED_RUBY_VERSION/bin/ruby; then \
       (apt-get update -y \
-        && apt-get install -y -q gcp-ruby-$REQUESTED_RUBY_VERSION) \
+        && apt-get --no-install-recommends install -y -q gcp-ruby-$REQUESTED_RUBY_VERSION) \
       || (cd /rbenv/plugins/ruby-build \
         && git pull \
         && rbenv install -s $REQUESTED_RUBY_VERSION) \