extras
/
coder-enterprise-images
mirror of https://github.com/coder/enterprise-images.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Jon Ayers 2023-02-14 10:51:15 -06:00 committed by GitHub
parent df40363d11
commit 0913166052
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
images/base/Dockerfile.centos
View File

@ -33,7 +33,7 @@ RUN dnf config-manager --add-repo https://download.docker.com/linux/centos/docke
systemctl enable docker systemctl enable docker
# Add docker-compose # 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 RUN chmod +x /usr/local/bin/docker-compose
# Make typing unicode characters in the terminal work. # Make typing unicode characters in the terminal work.
@ -51,5 +51,5 @@ RUN useradd coder \
USER coder USER coder
# install Homebrew, must be as a non-root user # 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} ENV PATH /home/linuxbrew/.linuxbrew/bin:${PATH}

4
images/base/Dockerfile.ubuntu
View File

@ -40,7 +40,7 @@ RUN apt-get update && \
RUN systemctl enable docker RUN systemctl enable docker
# Add docker-compose # 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 RUN chmod +x /usr/local/bin/docker-compose
# Make typing unicode characters in the terminal work. # Make typing unicode characters in the terminal work.
@ -58,5 +58,5 @@ RUN useradd coder \
USER coder USER coder
# install Homebrew, must be as a non-root user # 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} ENV PATH /home/linuxbrew/.linuxbrew/bin:${PATH}

2
images/golang/Dockerfile.centos
View File

@ -4,7 +4,7 @@ FROM codercom/enterprise-base:centos
USER root USER root
# Install go # 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 # Setup go env vars
ENV GOROOT /usr/local/go ENV GOROOT /usr/local/go

2
images/golang/Dockerfile.ubuntu
View File

@ -4,7 +4,7 @@ FROM codercom/enterprise-base:ubuntu
USER root USER root
# Install go # 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 # Setup go env vars
ENV GOROOT /usr/local/go ENV GOROOT /usr/local/go

4
images/ruby/install-ruby.sh
View File

@ -2,8 +2,8 @@
set -euo pipefail set -euo pipefail
RUBY_MAJOR=2.7 RUBY_MAJOR=2.7
RUBY_VERSION=2.7.2 RUBY_VERSION=2.7.7
RUBY_SHA256=6e5706d0d4ee4e1e2f883db9d768586b4d06567debea353c796ec45e8321c3d4 RUBY_SHA256=e10127db691d7ff36402cfe88f418c8d025a3f1eea92044b162dd72f0b8c7b90
RUBY_DOWNLOAD_PATH=/tmp/ruby.tar.gz RUBY_DOWNLOAD_PATH=/tmp/ruby.tar.gz
RUBY_SOURCE_DIR=/tmp/ruby-${RUBY_VERSION} RUBY_SOURCE_DIR=/tmp/ruby-${RUBY_VERSION}