diff options
| author | Can Eldem <celdem@gitlab.com> | 2020-02-27 16:49:42 +0000 |
|---|---|---|
| committer | Can Eldem <celdem@gitlab.com> | 2020-02-27 16:49:42 +0000 |
| commit | b04960caaf1abe23bc03d96688267f79aa6613a1 (patch) | |
| tree | 199103717826b9bcdf088fc062af1fe679ee8be8 /Dockerfile | |
| parent | c459a6d76a0f540ac4c5345d6f6124769aa55184 (diff) | |
| parent | b3563987c1c0aaa37b827713a291b53bd6048a4b (diff) | |
Merge branch '202126-gradle-specs' into 'master'v2.7.0
Ensure the `license-gradle-plugin` shim works across different versions of gradle
See merge request gitlab-org/security-products/license-management!118
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -23,13 +23,16 @@ RUN add-apt-repository ppa:ondrej/php -y && apt-get update -y && \ echo 'conan' >> $HOME/.default-python-packages && \ echo '\n. $HOME/.asdf/asdf.sh' >> $HOME/.bashrc && \ echo 'legacy_version_file = yes' > $HOME/.asdfrc && \ + asdf plugin-add gradle && \ asdf plugin-add java && \ asdf plugin-add python && \ + echo 'gradle system' >> $HOME/.tool-versions && \ echo 'java adopt-openjdk-8u242-b08 adopt-openjdk-11.0.6+10' >> $HOME/.tool-versions && \ echo 'python 3.8.1 3.5.9 2.7.17' >> $HOME/.tool-versions && \ asdf install && \ - asdf global python 3.8.1 && \ + asdf global gradle system && \ asdf global java adopt-openjdk-8u242-b08 && \ + asdf global python 3.8.1 && \ asdf reshim && \ bash -lc "gem install --no-document 'bundler:~> 1.7' 'bundler:~> 2.0'" && \ rm -fr /opt/jdk* && \ |