Skip to content

Commit 35cd39f

Browse files
committed
Merge pull request #29 from infosiftr/update-script
Update script for wheezy versions, bump 2.2 to rc1
2 parents c7bf9b8 + 991bdc9 commit 35cd39f

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

2.2/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM buildpack-deps:jessie
33
RUN apt-get update && apt-get install -y curl procps && rm -rf /var/lib/apt/lists/*
44

55
ENV RUBY_MAJOR 2.2
6-
ENV RUBY_VERSION 2.2.0-preview2
6+
ENV RUBY_VERSION 2.2.0-rc1
77

88
# some of ruby's build scripts are written in ruby
99
# we purge this later to make sure our final image uses what we just built

2.2/onbuild/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ruby:2.2.0-preview2
1+
FROM ruby:2.2.0-rc1
22

33
# throw errors if Gemfile has been modified since Gemfile.lock
44
RUN bundle config --global frozen 1

2.2/wheezy/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM buildpack-deps:wheezy
33
RUN apt-get update && apt-get install -y curl procps && rm -rf /var/lib/apt/lists/*
44

55
ENV RUBY_MAJOR 2.2
6-
ENV RUBY_VERSION 2.2.0-preview2
6+
ENV RUBY_VERSION 2.2.0-rc1
77

88
# some of ruby's build scripts are written in ruby
99
# we purge this later to make sure our final image uses what we just built

update.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ for version in "${versions[@]}"; do
1717
| sort -V | tail -1)"
1818
(
1919
set -x
20-
sed -ri 's/^(ENV RUBY_MAJOR) .*/\1 '"$version"'/' "$version/Dockerfile"
21-
sed -ri 's/^(ENV RUBY_VERSION) .*/\1 '"$fullVersion"'/' "$version/Dockerfile"
20+
sed -ri 's/^(ENV RUBY_MAJOR) .*/\1 '"$version"'/' "$version/"{,wheezy/}Dockerfile
21+
sed -ri 's/^(ENV RUBY_VERSION) .*/\1 '"$fullVersion"'/' "$version/"{,wheezy/}Dockerfile
2222
sed -ri 's/^(FROM ruby):.*/\1:'"$fullVersion"'/' "$version/"*"/Dockerfile"
2323
)
2424
done

0 commit comments

Comments
 (0)