Skip to content

Commit

Permalink
Bump swift, ruby & bundler
Browse files Browse the repository at this point in the history
  • Loading branch information
djbe committed Sep 13, 2021
1 parent 8b79bf1 commit ebc70c5
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker-image-ci.yml
Expand Up @@ -18,7 +18,7 @@ jobs:
strategy:
fail-fast: false
matrix:
version: [5.3]
version: [5.3, 5.4]
runs-on: ubuntu-latest
steps:
-
Expand Down
18 changes: 14 additions & 4 deletions swift-5.3/Dockerfile
@@ -1,9 +1,19 @@
FROM swift:5.3

# Install system packages
RUN apt-get update -y && apt-get install -y \
wget rubygems ruby-dev && \
RUN apt-get update -y && \
apt-get install -y curl wget && \
rm -r /var/lib/apt/lists/*

# Install bundler
RUN gem install bundler -v '~> 2.1.4'
# install RVM, Ruby, and Bundler
RUN gpg --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
RUN \curl -sSL https://get.rvm.io | bash -s stable
SHELL ["/bin/bash", "-l", "-c"]
RUN rvm requirements
RUN source /etc/profile.d/rvm.sh
RUN rvm install 2.6
RUN gem install bundler -f -v "~> 2.2.27"

# ensure we use login bash & correct path
ENTRYPOINT ["/bin/bash", "-l", "-c"]
ENV PATH="/usr/local/rvm/bin:/usr/local/rvm/gems/default/bin:/usr/local/rvm/rubies/default/bin:${PATH}"
19 changes: 19 additions & 0 deletions swift-5.4/Dockerfile
@@ -0,0 +1,19 @@
FROM swift:5.4

# Install system packages
RUN apt-get update -y && \
apt-get install -y curl wget && \
rm -r /var/lib/apt/lists/*

# install RVM, Ruby, and Bundler
RUN gpg --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
RUN \curl -sSL https://get.rvm.io | bash -s stable
SHELL ["/bin/bash", "-l", "-c"]
RUN rvm requirements
RUN source /etc/profile.d/rvm.sh
RUN rvm install 2.6
RUN gem install bundler -f -v "~> 2.2.27"

# ensure we use login bash & correct path
ENTRYPOINT ["/bin/bash", "-l", "-c"]
ENV PATH="/usr/local/rvm/bin:/usr/local/rvm/gems/default/bin:/usr/local/rvm/rubies/default/bin:${PATH}"

0 comments on commit ebc70c5

Please sign in to comment.