diff --git a/.changeset/popular-goats-perform.md b/.changeset/popular-goats-perform.md new file mode 100644 index 0000000..758878a --- /dev/null +++ b/.changeset/popular-goats-perform.md @@ -0,0 +1,5 @@ +--- +"@cartesi/sdk": minor +--- + +bump machine-emulator to 0.18.1 diff --git a/packages/sdk/Dockerfile b/packages/sdk/Dockerfile index d5f65d2..7bc3b4d 100644 --- a/packages/sdk/Dockerfile +++ b/packages/sdk/Dockerfile @@ -1,67 +1,80 @@ # syntax=docker.io/docker/dockerfile:1 ARG BASE_IMAGE -ARG SERVER_MANAGER_REGISTRY -ARG SERVER_MANAGER_ORG -ARG SERVER_MANAGER_VERSION +ARG CARTESI_MACHINE_EMULATOR_VERSION ARG CARTESI_IMAGE_KERNEL_VERSION ARG LINUX_KERNEL_VERSION ARG XGENEXT2_VERSION +ARG CRANE_VERSION +ARG NODEJS_VERSION +ARG SU_EXEC_VERSION +ARG ANVIL_VERSION + +################################################################################ +# base image +FROM ${BASE_IMAGE} AS base +SHELL ["/bin/bash", "-euo", "pipefail", "-c"] +ARG DEBIAN_FRONTEND=noninteractive +RUN < f85e5bde1afef399021fbc2a99c837cf851ceafa +ARG SU_EXEC_VERSION WORKDIR /usr/local/src -ADD https://github.com/ncopa/su-exec.git#f85e5bde1afef399021fbc2a99c837cf851ceafa /usr/local/src +ADD https://github.com/ncopa/su-exec.git#v${SU_EXEC_VERSION} /usr/local/src RUN make -FROM builder AS crane -ARG CRANE_VERSION=0.19.1 +################################################################################ +# crane installer +FROM base AS crane +ARG CRANE_VERSION RUN < /etc/apt/sources.list.d/backports.list -apt-get update apt-get install -y --no-install-recommends \ - ca-certificates \ - curl \ jq \ libarchive-tools \ + libslirp0 \ locales \ + lua5.4 \ nodejs \ npm \ squashfs-tools \ xxd \ xz-utils + +# Install e2fsprogs from backports +echo 'deb http://deb.debian.org/debian bookworm-backports main' > /etc/apt/sources.list.d/backports.list +apt-get update apt-get install -y --no-install-recommends -t bookworm-backports \ e2fsprogs rm -rf /var/lib/apt/lists/* @@ -96,24 +110,22 @@ EOF # Install dpkg release of xgenext2fs RUN <