Compare commits

...

2 Commits

Author SHA1 Message Date
seanauff c3354a0fc4 update to ubunto 20.04 2020-11-30 14:44:26 -05:00
seanauff dae10b8770 remove python2 packages 2020-09-15 20:12:57 -04:00
1 changed files with 10 additions and 10 deletions

View File

@ -1,24 +1,21 @@
FROM ubuntu:18.04 FROM ubuntu:20.04
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
ENV TZ=America/New_York ENV TZ=America/New_York
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
cmake \ cmake \
libjpeg8-dev \
g++ \ g++ \
wget \ wget \
unzip \ unzip \
psmisc \
git \ git \
python-virtualenv \ python2 \
virtualenv \ virtualenv \
python-dev \ python3-dev \
libffi-dev \ python3-virtualenv \
build-essential \ tzdata
tzdata \
zlib1g-dev \
libjpeg-dev
EXPOSE 5000 EXPOSE 5000
ARG tag=master ARG tag=master
@ -74,6 +71,9 @@ USER octoprint
WORKDIR /home/octoprint WORKDIR /home/octoprint
# Update the install script for Ubuntu 20
RUN sed -i 's/python-virtualenv //' ./klipper/scripts/install-ubuntu-18.04.sh
RUN git clone https://github.com/KevinOConnor/klipper RUN git clone https://github.com/KevinOConnor/klipper
RUN ./klipper/scripts/install-ubuntu-18.04.sh RUN ./klipper/scripts/install-ubuntu-18.04.sh