From 0913166052eceebe4ad4ce2644a54d7a1b2d31ba Mon Sep 17 00:00:00 2001
From: Jon Ayers <jon@coder.com>
Date: Tue, 14 Feb 2023 10:51:15 -0600
Subject: [PATCH] chore: prevent installing homebrew-core when installing
 homebrew (#201)

- There are some default libraries that contain test code that triggers
  our security scanners. Having homebrew installed should be sufficient
  for users. This will eventually be the default for all brew users anyway.
  See https://github.com/Homebrew/brew/issues/13794#issue-1359708246
- Update installed Go to 1.20
- Update Ruby to 2.7.7
- Update docker-compose to 2.16.0
---
 images/base/Dockerfile.centos   | 4 ++--
 images/base/Dockerfile.ubuntu   | 4 ++--
 images/golang/Dockerfile.centos | 2 +-
 images/golang/Dockerfile.ubuntu | 2 +-
 images/ruby/install-ruby.sh     | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/images/base/Dockerfile.centos b/images/base/Dockerfile.centos
index 6477aec..ff4192a 100644
--- a/images/base/Dockerfile.centos
+++ b/images/base/Dockerfile.centos
@@ -33,7 +33,7 @@ RUN dnf config-manager --add-repo https://download.docker.com/linux/centos/docke
     systemctl enable docker
 
 # Add docker-compose
-RUN curl -L "https://github.com/docker/compose/releases/download/v2.5.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+RUN curl -L "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
 RUN chmod +x /usr/local/bin/docker-compose
 
 # Make typing unicode characters in the terminal work.
@@ -51,5 +51,5 @@ RUN useradd coder \
 USER coder
 
 # install Homebrew, must be as a non-root user
-RUN /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+RUN HOMEBREW_INSTALL_FROM_API=1 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
 ENV PATH /home/linuxbrew/.linuxbrew/bin:${PATH}
diff --git a/images/base/Dockerfile.ubuntu b/images/base/Dockerfile.ubuntu
index 1072a67..8c043e5 100644
--- a/images/base/Dockerfile.ubuntu
+++ b/images/base/Dockerfile.ubuntu
@@ -40,7 +40,7 @@ RUN apt-get update && \
 RUN systemctl enable docker
 
 # Add docker-compose
-RUN curl -L "https://github.com/docker/compose/releases/download/v2.5.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+RUN curl -L "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
 RUN chmod +x /usr/local/bin/docker-compose
 
 # Make typing unicode characters in the terminal work.
@@ -58,5 +58,5 @@ RUN useradd coder \
 USER coder
 
 # install Homebrew, must be as a non-root user
-RUN /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+RUN HOMEBREW_INSTALL_FROM_API=1 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
 ENV PATH /home/linuxbrew/.linuxbrew/bin:${PATH}
diff --git a/images/golang/Dockerfile.centos b/images/golang/Dockerfile.centos
index 97b454b..b8c8975 100644
--- a/images/golang/Dockerfile.centos
+++ b/images/golang/Dockerfile.centos
@@ -4,7 +4,7 @@ FROM codercom/enterprise-base:centos
 USER root
 
 # Install go
-RUN curl -L "https://dl.google.com/go/go1.17.1.linux-amd64.tar.gz" | tar -C /usr/local -xzvf -
+RUN curl -L "https://go.dev/dl/go1.20.linux-amd64.tar.gz" | tar -C /usr/local -xzvf -
 
 # Setup go env vars
 ENV GOROOT /usr/local/go
diff --git a/images/golang/Dockerfile.ubuntu b/images/golang/Dockerfile.ubuntu
index 8fd6f17..a1ca633 100644
--- a/images/golang/Dockerfile.ubuntu
+++ b/images/golang/Dockerfile.ubuntu
@@ -4,7 +4,7 @@ FROM codercom/enterprise-base:ubuntu
 USER root
 
 # Install go
-RUN curl -L "https://dl.google.com/go/go1.17.1.linux-amd64.tar.gz" | tar -C /usr/local -xzvf -
+RUN curl -L "https://go.dev/dl/go1.20.linux-amd64.tar.gz" | tar -C /usr/local -xzvf -
 
 # Setup go env vars
 ENV GOROOT /usr/local/go
diff --git a/images/ruby/install-ruby.sh b/images/ruby/install-ruby.sh
index 9db2ab1..4695d26 100644
--- a/images/ruby/install-ruby.sh
+++ b/images/ruby/install-ruby.sh
@@ -2,8 +2,8 @@
 set -euo pipefail
 
 RUBY_MAJOR=2.7
-RUBY_VERSION=2.7.2
-RUBY_SHA256=6e5706d0d4ee4e1e2f883db9d768586b4d06567debea353c796ec45e8321c3d4
+RUBY_VERSION=2.7.7
+RUBY_SHA256=e10127db691d7ff36402cfe88f418c8d025a3f1eea92044b162dd72f0b8c7b90
 RUBY_DOWNLOAD_PATH=/tmp/ruby.tar.gz
 RUBY_SOURCE_DIR=/tmp/ruby-${RUBY_VERSION}