Bump toolchain to v0.4.0

cartesi · Jul 13, 2020 · fb9a2dc · fb9a2dc
1 parent b6cf33a
commit fb9a2dc
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -2,9 +2,9 @@ name: Build
 on: [push]
 jobs:
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
       - name: Build
         run: make -j$(nproc)
 

diff --git a/Dockerfile b/Dockerfile
@@ -31,6 +31,12 @@ ENV BUILD_BASE=$BASE/kernel
 RUN \
     mkdir -p $BUILD_BASE/artifacts
 
+RUN \
+    chown -R developer:developer $BUILD_BASE && \
+    chmod go+w $BUILD_BASE
+
+USER developer
+
 RUN \
     cd ${BUILD_BASE} && \
     wget -O linux-${KERNEL_VERSION}.tar.gz https://github.com/cartesi/linux/archive/v${KERNEL_VERSION}.tar.gz && \
@@ -71,6 +77,8 @@ RUN \
     riscv64-unknown-linux-gnu-objcopy -O binary bbl ${BUILD_BASE}/artifacts/linux-${KERNEL_VERSION}.bin && \
     truncate -s %4096 ${BUILD_BASE}/artifacts/linux-${KERNEL_VERSION}.bin
 
+USER root
+
 WORKDIR $BASE
 
 CMD ["/bin/bash", "-l"]
diff --git a/Makefile b/Makefile
@@ -14,7 +14,7 @@
 .PHONY: all build push run pull share copy clean clean-config
 
 TAG ?= devel
-TOOLCHAIN_TAG ?= 0.3.0
+TOOLCHAIN_TAG ?= 0.4.0
 KERNEL_VERSION ?= 5.5.19-ctsi-1
 RISCV_PK_VERSION ?= 1.0.0-ctsi-1
 KERNEL_CONFIG ?= configs/default-linux-config

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 # Cartesi Machine Image Linux Kernel 
 
-The Cartesi Image Linux Kernel is the repository that provides the Docker configuration files to build the Linux kernel `linux.bin` image. This is used to run a Linux environment on the Cartesi Machine Emulator reference implementation. The current image is based on the `cartesi/toolchain` that uses Ubuntu 18.04 and GNU GCC 8.3.0. The `linux.bin` is built from the Linux 5.5.x source, targeting the RISC-V RV64IMA with ABI LP64 architecture.
+The Cartesi Image Linux Kernel is the repository that provides the Docker configuration files to build the Linux kernel `linux.bin` image. This is used to run a Linux environment on the Cartesi Machine Emulator reference implementation. The current image is based on the `cartesi/toolchain` that uses Ubuntu 20.04 and GNU GCC 9.3.0. The `linux.bin` is built from the Linux 5.5.x source, targeting the RISC-V RV64IMA with ABI LP64 architecture.
 
 ## Getting Started