laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/21739 )
Change subject: fpga-build: Make riscv + fpga toolchain version configurable ...................................................................... fpga-build: Make riscv + fpga toolchain version configurable Change-Id: I8969e383975c673c29169ff5b60229c4a75a499c --- M fpga-build/Dockerfile 1 file changed, 9 insertions(+), 8 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/fpga-build/Dockerfile b/fpga-build/Dockerfile index 9253f73..4056143 100644 --- a/fpga-build/Dockerfile +++ b/fpga-build/Dockerfile @@ -3,15 +3,16 @@ MAINTAINER Harald Welte <lafo...@gnumonks.org> -ARG TOOLCHAIN_DATE=20200914 +ARG FPGA_TOOLCHAIN_DATE=20200914 +ARG RISCV_TOOLCHAIN_VER=8.3.0-1.2 -RUN wget --quiet https://github.com/open-tool-forge/fpga-toolchain/releases/download/nightly-$TOOLCHAIN_DATE/fpga-toolchain-linux_x86_64-nightly-$TOOLCHAIN_DATE.tar.gz -RUN tar -C /opt -xzf fpga-toolchain-linux_x86_64-nightly-$TOOLCHAIN_DATE.tar.gz && \ - rm fpga-toolchain-linux_x86_64-nightly-$TOOLCHAIN_DATE.tar.gz +RUN wget https://github.com/open-tool-forge/fpga-toolchain/releases/download/nightly-${FPGA_TOOLCHAIN_DATE}/fpga-toolchain-linux_x86_64-nightly-${FPGA_TOOLCHAIN_DATE}.tar.xz +RUN tar -C /opt -xf fpga-toolchain-linux_x86_64-nightly-${FPGA_TOOLCHAIN_DATE}.tar.xz && \ + rm fpga-toolchain-linux_x86_64-nightly-${FPGA_TOOLCHAIN_DATE}.tar.xz -RUN wget --quiet https://github.com/xpack-dev-tools/riscv-none-embed-gcc-xpack/releases/download/v8.3.0-1.2/xpack-riscv-none-embed-gcc-8.3.0-1.2-linux-x64.tar.gz -RUN tar -C /opt -xzvf /xpack-riscv-none-embed-gcc-8.3.0-1.2-linux-x64.tar.gz && \ - rm xpack-riscv-none-embed-gcc-8.3.0-1.2-linux-x64.tar.gz +RUN wget --quiet https://github.com/xpack-dev-tools/riscv-none-embed-gcc-xpack/releases/download/v${RISCV_TOOLCHAIN_VER}/xpack-riscv-none-embed-gcc-${RISCV_TOOLCHAIN_VER}-linux-x64.tar.gz +RUN tar -C /opt -xf /xpack-riscv-none-embed-gcc-${RISCV_TOOLCHAIN_VER}-linux-x64.tar.gz && \ + rm xpack-riscv-none-embed-gcc-${RISCV_TOOLCHAIN_VER}-linux-x64.tar.gz RUN apt-get update && \ apt-get upgrade -y && \ @@ -23,4 +24,4 @@ USER osmocom WORKDIR /home/osmocom -ENV PATH=/opt/fpga-toolchain/bin:/opt/xpack-riscv-none-embed-gcc-8.3.0-1.2/bin:${PATH} +ENV PATH=/opt/fpga-toolchain/bin:/opt/xpack-riscv-none-embed-gcc-${RISCV_TOOLCHAIN_VER}/bin:${PATH} -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/21739 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I8969e383975c673c29169ff5b60229c4a75a499c Gerrit-Change-Number: 21739 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <lafo...@osmocom.org> Gerrit-Reviewer: laforge <lafo...@osmocom.org> Gerrit-MessageType: merged