Skip to content

Commit 8345278

Browse files
committed
Fix Oracle Linux Dockerfile
PullRequest: truffleruby/717
2 parents e69580d + 8ef491c commit 8345278

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

doc/user/installing-llvm.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ For building C extensions you need to install:
1212

1313
```
1414
yum install -y make
15-
yum-config-manager --enable ol7_developer
16-
yum-config-manager --enable ol7_software_collections
15+
yum install -y oraclelinux-developer-release-el7 oracle-softwarecollection-release-el7
1716
yum install -y llvm-toolset-7
1817
export PATH=$PATH:/opt/rh/llvm-toolset-7/root/usr/bin
1918
export LD_LIBRARY_PATH=/opt/rh/llvm-toolset-7/root/usr/lib64

tool/docker-configs.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ ol7:
2121
- RUN yum install -y openssl-devel
2222
cext:
2323
- RUN yum install -y make
24-
- RUN yum-config-manager --enable ol7_developer
25-
- RUN yum-config-manager --enable ol7_software_collections
24+
- RUN yum install -y oraclelinux-developer-release-el7
25+
- RUN yum install -y oracle-softwarecollection-release-el7
2626
- RUN yum install -y llvm-toolset-7
2727
- ENV PATH=$PATH:/opt/rh/llvm-toolset-7/root/usr/bin
2828
- ENV LD_LIBRARY_PATH=/opt/rh/llvm-toolset-7/root/usr/lib64

tool/jt.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2109,7 +2109,7 @@ def dockerfile(*args)
21092109
truffleruby_repo = 'https://github.com/oracle/truffleruby.git'
21102110
distro = 'ol7'
21112111
install_method = :public
2112-
public_version = '1.0.0-rc6'
2112+
public_version = '1.0.0-rc14'
21132113
rebuild_images = false
21142114
rebuild_openssl = true
21152115
manager = :none

0 commit comments

Comments
 (0)