1
0
mirror of https://github.com/rhasspy/rhasspy.git synced 2022-02-12 01:59:45 +03:00

Fix escape in Dockerfile

This commit is contained in:
Michael Hansen
2021-07-02 11:51:50 -04:00
parent 27601589a0
commit 2f0900d3fd

View File

@@ -33,7 +33,7 @@ ENV DEBIAN_FRONTEND=noninteractive
#! RUN echo 'Acquire::http { Proxy "http://${APT_PROXY_HOST}:${APT_PROXY_PORT}"; };' >> /etc/apt/apt.conf.d/01proxy
# ENDIF
RUN --mount=type=cache,target=/var/cache/apt \
RUN --mount=type=cache,id=apt-build,target=/var/cache/apt \
apt-get update && \
apt-get install --no-install-recommends --yes \
python3 python3-dev python3-setuptools python3-pip python3-venv \
@@ -47,13 +47,14 @@ FROM build-debian as build-amd64
FROM build-debian as build-armv7
RUN --mount=type=cache,target=/var/cache/apt \
RUN --mount=type=cache,id=apt-build-armv7,target=/var/cache/apt \
apt-get install --no-install-recommends --yes \
libatlas-base-dev libopenblas-dev gfortran
FROM build-debian as build-arm64
RUN apt-get install --no-install-recommends --yes \
RUN --mount=type=cache,id=apt-build-arm64,target=/var/cache/apt \
apt-get install --no-install-recommends --yes \
libatlas-base-dev libopenblas-dev gfortran
# -----------------------------------------------------------------------------
@@ -68,7 +69,7 @@ ENV DEBIAN_FRONTEND=noninteractive
#! RUN echo 'Acquire::http { Proxy "http://${APT_PROXY_HOST}:${APT_PROXY_PORT}"; };' >> /etc/apt/apt.conf.d/01proxy
# ENDIF
RUN --mount=type=cache,target=/var/cache/apt \
RUN --mount=type=cache,id=apt-build-armv6,target=/var/cache/apt \
install_packages \
swig libatlas-base-dev portaudio19-dev \
gfortran libopenblas-dev liblapack-dev cython \
@@ -148,7 +149,7 @@ COPY RHASSPY_DIRS ${BUILD_DIR}/
#! ENV PIP_TRUSTED_HOST=${PYPI_PROXY_HOST}
# ENDIF
RUN --mount=type=cache,target=/root/.cache/pip \
RUN --mount=type=cache,id=pip-build,target=/root/.cache/pip \
export PIP_INSTALL_ARGS="-f ${DOWNLOAD_DIR}/shared -f ${DOWNLOAD_DIR}/${TARGETARCH}${TARGETVARIANT}" && \
export PIP_PREINSTALL_PACKAGES='numpy==1.20.1 scipy==1.5.1' && \
export PIP_VERSION='pip<=20.2.4' && \
@@ -164,7 +165,7 @@ RUN --mount=type=cache,target=/root/.cache/pip \
make install
RUN cd ${APP_DIR}/.venv && \
find . -type f -name 'g2p.fst.gz' -exec gunzip -f {} \\;
find . -type f -name 'g2p.fst.gz' -exec gunzip -f {} \;
# -----------------------------------------------------------------------------
@@ -178,7 +179,7 @@ FROM debian:buster as run-debian
ENV LANG C.UTF-8
ENV DEBIAN_FRONTEND=noninteractive
RUN --mount=type=cache,target=/var/cache/apt \
RUN --mount=type=cache,id=apt-run,target=/var/cache/apt \
apt-get update && \
apt-get install --yes --no-install-recommends \
python3 libpython3.7 python3-pip python3-setuptools python3-distutils \
@@ -214,7 +215,7 @@ FROM balenalib/raspberry-pi-debian-python:3.7-buster-run-20210201 as run-armv6
ENV LANG C.UTF-8
ENV DEBIAN_FRONTEND=noninteractive
RUN --mount=type=cache,target=/var/cache/apt \
RUN --mount=type=cache,id=apt-run-armv6,target=/var/cache/apt \
install_packages \
python3 libpython3.7 python3-pip python3-setuptools \
libportaudio2 libatlas3-base libgfortran4 \