Skip to content

Commit

Permalink
chore: upgrade contents of jsii/superchain (#1245)
Browse files Browse the repository at this point in the history 
Include dotnet-sdk-3.1 instead of 3.0 (the 3.1 SDK can build projects that target
the 3.0 versions of the framework).

Upgrade Ruby from 2.4 (EOL end of march) to 2.6.

Generally speaking, update the README.md of the image to reflect the current
minimal versions included.
  • Loading branch information
@RomainMuller
RomainMuller authored Feb 7, 2020
1 parent 11fff57 commit 422383d
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 17 deletions.
10 changes: 5 additions & 5 deletions superchain/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ RUN rpm --import "https://packages.microsoft.com/keys/microsoft.asc"
&& rpm --import /tmp/mono.asc && rm -f /tmp/mono.asc \
&& curl -sSL "https://download.mono-project.com/repo/centos7-stable.repo" \
| tee /etc/yum.repos.d/mono-centos7-stable.repo \
&& yum -y install dotnet-sdk-3.0 mono-devel powershell \
&& yum -y install dotnet-sdk-3.1 mono-devel powershell \
&& yum clean all && rm -rf /var/cache/yum \
&& dotnet help

Expand All @@ -23,15 +23,15 @@ RUN yum -y install python3 python3-pip
&& python3 -m pip install --upgrade pip setuptools wheel twine \
&& yum clean all && rm -rf /var/cache/yum

# Install Ruby 2.4+
# Install Ruby 2.6+
ENV GEM_HOME /usr/local/bundle
RUN amazon-linux-extras install ruby2.4 \
RUN amazon-linux-extras install ruby2.6 \
&& yum -y install gcc make ruby-devel rubygem-rdoc system-rpm-config \
&& yum clean all && rm -rf /var/cache/yum \
&& echo 'install: --no-document' > /usr/local/etc/gemrc \
&& echo 'update: --no-document' >> /usr/local/etc/gemrc \
&& mkdir -p "$GEM_HOME" \
&& gem install 'bundler:~>1.17.2' 'bundler:~>2.0.2'
&& gem install 'bundler:~>1.17.3' 'bundler:~>2.1.4'
ENV BUNDLE_SILENCE_ROOT_WARNING=1 \
PATH="$GEM_HOME/bin:$GEM_HOME/gems/bin:$PATH"

Expand Down Expand Up @@ -70,7 +70,7 @@ VOLUME /var/lib/docker
RUN yum -y install awscli git gzip openssl rsync unzip which zip \
&& yum clean all && rm -rf /var/cache/yum

# Install Node 8+
# Install Node 10+
RUN curl -sL https://rpm.nodesource.com/setup_10.x | bash - \
&& yum -y install nodejs \
&& yum clean all && rm -rf /var/cache/yum \
Expand Down
24 changes: 12 additions & 12 deletions superchain/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,28 +9,28 @@ required in order to package [jsii] projects in all supported languages.

SDK | Version
----------------|-------------------------------------------
`OpenJDK 8` | Amazon Corretto `>= 8.222.10.2`
`.NET SDK` | `>= 3.0.100`
`mono` | `>= 6.0.0.319`
`Javascript` | `node >= 10.17.0` with `npm >= 6.9.0`
`OpenJDK 8` | Amazon Corretto `>= 8.242.08.1`
`.NET SDK` | `>= 3.1.101`
`mono` | `>= 6.8.0.105`
`Javascript` | `node >= 10.19.0` with `npm >= 6.13.4`
`PowerShell` | `pwsh >= 6.2.3`
`Python 3` | `python3 >= 3.7.4` with `pip3 >= 19.3`
`Ruby` | `ruby >= 2.4.7p357`
`Python 3` | `python3 >= 3.7.4` with `pip3 >= 20.0.2`
`Ruby` | `ruby >= 2.6.3p62`

## Included Tools & Utilities

Tool / Utility | Version
---------------|--------------------------------------------
`aws` | `>= 1.16.102`
`bundler` | `>= 1.17.2` and `>= 2.0.2`
`aws` | `>= 1.16.300`
`bundler` | `>= 1.17.3` and `>= 2.1.4`
`gcc` | `>= 7.3.1`
`docker` | `>= 18.06.1-ce`
`git` | `>= 2.17.2`
`docker` | `>= 18.09.9-ce`
`git` | `>= 2.23.1`
`make` | `>= 3.82`
`maven` | `>= 3.6.3`
`openssl` | `>= 1.0.2k-fips`
`rsync` | `>= 3.1.2-4`
`yarn` | `>= 1.19.1`
`rsync` | `>= 3.1.2`
`yarn` | `>= 1.21.1`
`zip` & `unzip`| `>= 6.0-19`

## License
Expand Down

0 comments on commit 422383d

Please sign in to comment.