ahamilton/eris
1
0
Fork 0
Code Releases Activity

docker: Fix install.

Browse source 
- Need a newer version of pip to install eris.
- Eris has new --config and --version options.
- Not adding --apt-install-tools because tools are already bundled
  in the docker image.
This commit is contained in:
Andrew Hamilton 2021-12-27 15:49:30 +10:00
parent faa58d1d69
commit dc0a5a32b9
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
packaging/Dockerfile
View file

@ -4,6 +4,7 @@ FROM ubuntu:impish
RUN apt-get update RUN apt-get update
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata RUN DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata
RUN apt-get install -y sudo python3.9 python3-pip RUN apt-get install -y sudo python3.9 python3-pip
RUN python3.9 -m pip install --upgrade pip
COPY . eris COPY . eris
RUN cd eris && ./install RUN cd eris && ./install

2
packaging/eris-docker
View file

@ -5,7 +5,7 @@ set -e
DOCKER_IMAGE=eris DOCKER_IMAGE=eris
ARGS=( $(getopt -u -o hiw:e:t:c: --long help,info,workers:,editor:,theme:,compression: -- "$@") ) ARGS=( $(getopt -u -o hiw:e:t:c: --long help,info,version,workers:,editor:,theme:,compression:,config: -- "$@") )
if [ "${ARGS[-1]}" == "--" ]; then if [ "${ARGS[-1]}" == "--" ]; then
OPTION_ARGS="${ARGS[@]:0:${#ARGS[@]}-1}" # ARGS[:-1] OPTION_ARGS="${ARGS[@]:0:${#ARGS[@]}-1}" # ARGS[:-1]
DOCKER_ARGS="$DOCKER_IMAGE $OPTION_ARGS" DOCKER_ARGS="$DOCKER_IMAGE $OPTION_ARGS"