From f158da34f69a5496e88a4396188d82a1f513e849 Mon Sep 17 00:00:00 2001 From: Zane Wolfgang Pickett Date: Sun, 14 Feb 2021 20:31:07 -0800 Subject: [PATCH 1/2] Update mycroft --- Dockerfile | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0fc0672..80497cc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,19 +11,24 @@ ARG mimic_pkg=mimic ARG host_locale=en_US.UTF-8 +ARG mycroft_core_tag=release/v20.8.1 + ENV TERM linux ENV DEBIAN_FRONTEND noninteractive # Install Server Dependencies for Mycroft RUN set -x \ - && apt-get update \ + && apt-get update \ && apt-get -y install \ git \ locales \ procps \ python3 \ python3-pip \ + python3-dev \ sudo \ + build-essential \ + cargo \ bison \ curl \ flac \ @@ -41,13 +46,15 @@ RUN set -x \ python3-setuptools \ swig \ zlib1g-dev \ - && pip3 install future msm \ - # Checkout Mycroft - && git clone https://github.com/MycroftAI/mycroft-core.git /opt/mycroft \ - --branch=release/v20.2.4 \ + # Cryptography + && curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | bash -s -- -y \ + && pip3 install --upgrade pip \ + && pip3 install cryptography --no-binary cryptography \ + # Checkout Mycroft + && git clone https://github.com/MycroftAI/mycroft-core.git /opt/mycroft --branch=$mycroft_core_tag \ && cd /opt/mycroft \ && mkdir /opt/mycroft/skills \ - && pip3 install \ + && pip3 install --upgrade --ignore-installed pyxdg \ -r /opt/mycroft/requirements/requirements.txt RUN curl https://forslund.github.io/mycroft-desktop-repo/mycroft-desktop.gpg.key \ @@ -62,7 +69,7 @@ RUN curl https://forslund.github.io/mycroft-desktop-repo/mycroft-desktop.gpg.key # Set the locale RUN sed -i -e 's/# \('"$host_locale"' .*\)/\1/' /etc/locale.gen \ - && dpkg-reconfigure --frontend=noninteractive locales \ + && dpkg-reconfigure --frontend=noninteractive locales \ && update-locale LANG=$host_locale WORKDIR /opt/mycroft From 143d1f1a92a07eafd78bc955d5587a62d4e315d6 Mon Sep 17 00:00:00 2001 From: Zane Wolfgang Pickett Date: Sun, 21 Feb 2021 07:02:53 -0800 Subject: [PATCH 2/2] Fix pip warning --- Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 80497cc..7ba48c3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -48,13 +48,12 @@ RUN set -x \ zlib1g-dev \ # Cryptography && curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | bash -s -- -y \ - && pip3 install --upgrade pip \ - && pip3 install cryptography --no-binary cryptography \ + && python3 -m pip install cryptography --no-binary cryptography \ # Checkout Mycroft && git clone https://github.com/MycroftAI/mycroft-core.git /opt/mycroft --branch=$mycroft_core_tag \ && cd /opt/mycroft \ && mkdir /opt/mycroft/skills \ - && pip3 install --upgrade --ignore-installed pyxdg \ + && python3 -m pip install --upgrade \ -r /opt/mycroft/requirements/requirements.txt RUN curl https://forslund.github.io/mycroft-desktop-repo/mycroft-desktop.gpg.key \