Compare commits

...

1 Commits

Author SHA1 Message Date
Avi Kivity
2edc1ca039 tools: toolchain: update to Fedora 33 with clang 11
Update the toolchain to Fedora 33 with clang 11 (note the
build still uses gcc).

The image now creates a /root/.m2/repository directory; without
this the tools/jmx build fails on aarch64.

Add java-1.8.0-openjdk-devel since that is where javac lives now.
Add a JAVA8_HOME environment variable; wihtout this ant is not
able to find javac.

The toolchain is enabled for x86_64 and aarch64.
2020-10-28 17:02:53 +02:00
3 changed files with 7 additions and 2 deletions

View File

@@ -28,6 +28,7 @@ else
fi
debian_base_packages=(
clang
liblua5.3-dev
python3-pyparsing
python3-colorama
@@ -44,6 +45,7 @@ debian_base_packages=(
)
fedora_packages=(
clang
lua-devel
yaml-cpp-devel
thrift-devel
@@ -57,6 +59,7 @@ fedora_packages=(
python
sudo
java-1.8.0-openjdk-headless
java-1.8.0-openjdk-devel
ant
ant-junit
maven

View File

@@ -1,4 +1,4 @@
FROM docker.io/fedora:32
FROM docker.io/fedora:33
ADD ./install-dependencies.sh ./
ADD ./seastar/install-dependencies.sh ./seastar/
ADD ./tools/toolchain/system-auth ./
@@ -10,4 +10,6 @@ RUN dnf -y install 'dnf-command(copr)' \
&& echo 'ALL ALL=(ALL:ALL) NOPASSWD: ALL' >> /etc/sudoers \
&& cp system-auth /etc/pam.d \
&& echo 'Defaults !requiretty' >> /etc/sudoers
RUN mkdir -p /root/.m2/repository
ENV JAVA8_HOME=/usr/lib/jvm/java-1.8.0-openjdk
CMD /bin/bash

View File

@@ -1 +1 @@
docker.io/scylladb/scylla-toolchain:fedora-32-20200910
docker.io/scylladb/scylla-toolchain:fedora-33-20201028