From 03a8f6059a816fb7d0ea53fc96725fac106023a9 Mon Sep 17 00:00:00 2001 From: Carsten Munk Date: Thu, 25 Apr 2024 08:17:04 +0000 Subject: [PATCH] Make the setup saner Signed-off-by: Carsten Munk --- Dockerfile | 2 +- install-pkgs | 2 +- install-pkgs-2 | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3557c48..a8c37ec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,7 +40,7 @@ ENV SOURCE_DATE_EPOCH=1695938400 COPY --from=genext2fs-build /genext2fs/genext2fs.deb /genext2fs.deb RUN dpkg -i /genext2fs.deb -RUN debootstrap --include=wget --foreign --arch riscv64 jammy /replicate/release https://snapshot.ubuntu.com/ubuntu/20231201T000000Z +RUN debootstrap --include=wget,busybox-static --foreign --arch riscv64 jammy /replicate/release https://snapshot.ubuntu.com/ubuntu/20231201T000000Z RUN rm -rf /replicate/release/debootstrap/debootstrap.log RUN touch /replicate/release/debootstrap/debootstrap.log RUN echo -n "ubuntu" > /replicate/release/etc/hostname diff --git a/install-pkgs b/install-pkgs index 2171df2..a8b5534 100644 --- a/install-pkgs +++ b/install-pkgs @@ -2,7 +2,7 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin export PATH export DEBIAN_FRONTEND="noninteractive" -dpkg -i /mnt/machine-emulator-tools-v0.12.0.deb +dpkg -i /mnt/machine-emulator-tools-v0.15.0.deb date -s '2023-12-02 00:00:00' /opt/cartesi/bin/rndaddentropy < /opt/cartesi/bin/rndaddentropy mkdir -p / diff --git a/install-pkgs-2 b/install-pkgs-2 index 9cfede1..d936d4d 100644 --- a/install-pkgs-2 +++ b/install-pkgs-2 @@ -2,7 +2,6 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin export PATH export DEBIAN_FRONTEND="noninteractive" -dpkg -i /mnt/machine-emulator-tools-v0.15.0.deb mkdir -p /usr/local/bin/ cp /mnt/nerdctl /usr/bin cp /mnt/containerd-stargz-grpc /usr/local/bin @@ -34,8 +33,7 @@ systemctl enable systemd-networkd.service echo -n "Enabled.." -/opt/cartesi/bin/rndaddentropy < /opt/cartesi/var/run/random-seed - +mkdir -p /opt/cartesi/bin/ cat > /opt/cartesi/bin/run-app.sh << EOF #!/bin/bash export IPFS_PATH=/root/.ipfs