From d8632da96b784f165634141ad25c7f182b995844 Mon Sep 17 00:00:00 2001 From: Blake Harnden <32446120+bharnden@users.noreply.github.com> Date: Wed, 27 Jul 2022 16:41:23 -0700 Subject: [PATCH] install: fixed install.md error for docker build command, fixed default dockerfile example for centos package install to not use NO_VENV --- docs/install.md | 34 +++++++++++++++++++++++++++++++++- package/Dockerfile.centos | 2 +- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/docs/install.md b/docs/install.md index 0f15133c..7a00b680 100644 --- a/docs/install.md +++ b/docs/install.md @@ -105,6 +105,38 @@ sudo yum remove core sudo apt remove core ``` +## Installing from Packages + +Starting with 9.0.0 there are pre-built rpm/deb packages. You can retrieve the +rpm/deb package from [releases](https://github.com/coreemu/core/releases) page. + +> **NOTE:** PYTHON defaults to python3 for installs below + +> **NOTE:** the python install requires python3.6+, pip, +> tk compatibility for python gui, and venv for virtualenvs + +```shell +# install core vcmd/vnoded, system dependencies, +# and core python into a venv located at /opt/core/venv + install -y ./ + +# disable the venv and install to python directly +NO_VENV=1 install -y ./ + +# change python executable used to install for venv and direct installations +PYTHON=python3.9 install -y ./ + +# disable venv and change python executable +NO_VENV=1 PYTHON=python3.9 install -y ./ + +# skip installing the python portion entirely, as you plan to carry this out yourself +# core python wheel is located at /opt/core/core--py3-none-any.whl +NO_PYTHON=1 install -y ./ + +# install python wheel into python of your choosing + -m pip install /opt/core/core--py3-none-any.whl +``` + ## Automated Install First we will need to clone and navigate to the CORE repo. ```shell @@ -218,7 +250,7 @@ You can leverage the provided Dockerfile, to run and launch CORE within a Docker git clone https://github.com/coreemu/core.git cd core # build image -sudo docker build -t core. -f Dockerfile. +sudo docker build -t core. -f Dockerfile. . # start container sudo docker run -itd --name core -e DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix:rw --privileged core. # enable xhost access to the root user diff --git a/package/Dockerfile.centos b/package/Dockerfile.centos index 6cbb3610..8304f820 100644 --- a/package/Dockerfile.centos +++ b/package/Dockerfile.centos @@ -12,4 +12,4 @@ RUN python3 -m pip install --upgrade pip # install core WORKDIR /opt/core COPY core_*.rpm . -RUN NO_VENV=1 yum install -y ./core_*.rpm +RUN yum install -y ./core_*.rpm