From 21cf9ad75c6fb8f050036379780a3c142d8d3451 Mon Sep 17 00:00:00 2001 From: SuperMaxusa <41739128+SuperMaxusa@users.noreply.github.com> Date: Mon, 5 Feb 2024 00:35:51 +0200 Subject: [PATCH] Update Dockerfile for building (#988) Update Readme.md (about building using Docker) --- Readme.md | 4 ++-- tools/docker/exec/Dockerfile | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Readme.md b/Readme.md index 81e0be1da8..fcbc54c1a6 100644 --- a/Readme.md +++ b/Readme.md @@ -134,8 +134,8 @@ for a full setup on Debian or - If you have docker installed, you can run the whole system inside a container. - See `tools/docker/exec` to find Dockerfile required for this. -- You can run `docker build -f tools/docker/exec/Dockerfile -t v86:alpine-3.14 .` from the root directory to generate docker image. -- Then you can simply run `docker run -it -p 8000:8000 v86:alpine-3.14` to start the server. +- You can run `docker build -f tools/docker/exec/Dockerfile -t v86:alpine-3.19 .` from the root directory to generate docker image. +- Then you can simply run `docker run -it -p 8000:8000 v86:alpine-3.19` to start the server. - Check `localhost:8000` for hosted server. ### Running via Devcontainer diff --git a/tools/docker/exec/Dockerfile b/tools/docker/exec/Dockerfile index efa1c7fd13..007c5a2484 100644 --- a/tools/docker/exec/Dockerfile +++ b/tools/docker/exec/Dockerfile @@ -1,7 +1,7 @@ -FROM alpine:3.14 as v86-builder +FROM alpine:3.19 as v86-builder WORKDIR /v86 -RUN apk add --update curl clang make openjdk8 npm python3 +RUN apk add --update curl clang make openjdk8-jre-base npm python3 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && PATH="${HOME}/.cargo/bin:${PATH}" rustup target add wasm32-unknown-unknown @@ -9,7 +9,7 @@ COPY . . RUN PATH="${HOME}/.cargo/bin:${PATH}" make all && rm -rf closure-compiler gen lib src tools .cargo cargo.toml Makefile -FROM python:3.9.6-alpine3.14 +FROM python:3.10.13-alpine3.19 WORKDIR /v86 COPY --from=v86-builder v86 .