Skip to content

Commit

Permalink
Add a few comments
Browse files Browse the repository at this point in the history
  • Loading branch information
lloeki committed Nov 21, 2022
1 parent 529d206 commit 0b6dd70
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 4 deletions.
6 changes: 4 additions & 2 deletions .circleci/images/primary/Dockerfile-2.1.10
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ RUN mkdir -p /usr/local/etc \
ENV RUBY_MAJOR 2.1
ENV RUBY_VERSION 2.1.10
ENV RUBY_DOWNLOAD_SHA256 5be9f8d5d29d252cd7f969ab7550e31bbb001feb4a83532301c0dd3b5006e148
ENV RUBYGEMS_VERSION 2.6.12
ENV RUBYGEMS_VERSION 2.6.12 # TODO: update only once

# some of ruby's build scripts are written in ruby
# we purge system ruby later to make sure our final image uses what we just built
Expand Down Expand Up @@ -65,7 +65,7 @@ RUN set -ex \
\
&& gem update --system "$RUBYGEMS_VERSION"

ENV BUNDLER_VERSION 1.15.1
ENV BUNDLER_VERSION 1.15.1 # TODO: update only once

RUN gem install bundler --version "$BUNDLER_VERSION"

Expand Down Expand Up @@ -123,6 +123,8 @@ RUN set -ex \
&& (docker version || true)

# Install Docker Compose
# Releases over there don't work as they need a more recent glibc than Stretch has: https://github.com/linuxserver/docker-docker-compose/releases/download/1.29.2-ls51
# So we fall back to using stretch-backports which has 1.21
RUN echo 'deb http://ftp.debian.org/debian stretch-backports main\ndeb-src http://ftp.debian.org/debian stretch-backports main' > /etc/apt/sources.list.d/stretch-backports.list \
&& apt-get update \
&& apt-get install -y docker-compose \
Expand Down
6 changes: 4 additions & 2 deletions .circleci/images/primary/Dockerfile-2.2.10
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ RUN mkdir -p /usr/local/etc \
ENV RUBY_MAJOR 2.2
ENV RUBY_VERSION 2.2.10
ENV RUBY_DOWNLOAD_SHA256 bf77bcb7e6666ccae8d0882ea12b05f382f963f0a9a5285a328760c06a9ab650
ENV RUBYGEMS_VERSION 2.7.7
ENV BUNDLER_VERSION 1.16.2
ENV RUBYGEMS_VERSION 2.7.7 # TODO: update only once
ENV BUNDLER_VERSION 1.16.2 # TODO: update only once

# some of ruby's build scripts are written in ruby
# we purge system ruby later to make sure our final image uses what we just built
Expand Down Expand Up @@ -123,6 +123,8 @@ RUN set -ex \
&& (docker version || true)

# Install Docker Compose
# Releases over there don't work as they need a more recent glibc than Stretch has: https://github.com/linuxserver/docker-docker-compose/releases/download/1.29.2-ls51
# So we fall back to using stretch-backports which has 1.21
RUN echo 'deb http://ftp.debian.org/debian stretch-backports main\ndeb-src http://ftp.debian.org/debian stretch-backports main' > /etc/apt/sources.list.d/stretch-backports.list \
&& apt-get update \
&& apt-get install -y docker-compose \
Expand Down
2 changes: 2 additions & 0 deletions .circleci/images/primary/Dockerfile-2.3.8
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ RUN set -ex \
&& (docker version || true)

# Install Docker Compose
# Releases over there don't work as they need a more recent glibc than Stretch has: https://github.com/linuxserver/docker-docker-compose/releases/download/1.29.2-ls51
# So we fall back to using stretch-backports which has 1.21
RUN echo 'deb http://ftp.debian.org/debian stretch-backports main\ndeb-src http://ftp.debian.org/debian stretch-backports main' > /etc/apt/sources.list.d/stretch-backports.list \
&& apt-get update \
&& apt-get install -y docker-compose \
Expand Down
2 changes: 2 additions & 0 deletions .circleci/images/primary/Dockerfile-2.4.10
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ RUN set -ex \
&& (docker version || true)

# Install Docker Compose
# Releases over there don't work as they need a more recent glibc than Stretch has: https://github.com/linuxserver/docker-docker-compose/releases/download/1.29.2-ls51
# So we fall back to using stretch-backports which has 1.21
RUN echo 'deb http://ftp.debian.org/debian stretch-backports main\ndeb-src http://ftp.debian.org/debian stretch-backports main' > /etc/apt/sources.list.d/stretch-backports.list \
&& apt-get update \
&& apt-get install -y docker-compose \
Expand Down

0 comments on commit 0b6dd70

Please sign in to comment.