[gimp/wip/schumaml/crossraods-optimization: 54/57] gitlab-ci: Dockerfile doesn't need escaped \ continuation anymore
- From: Michael Schumacher <schumaml src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/wip/schumaml/crossraods-optimization: 54/57] gitlab-ci: Dockerfile doesn't need escaped \ continuation anymore
- Date: Mon, 7 Dec 2020 18:36:12 +0000 (UTC)
commit b86181c70f0ed762bc37709d18184a86b61c95aa
Author: Michael Schumacher <schumaml gmx de>
Date: Sun Dec 6 01:25:04 2020 +0100
gitlab-ci: Dockerfile doesn't need escaped \ continuation anymore
build/docker/CI/Dockerfile.win64 | 36 ++++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/build/docker/CI/Dockerfile.win64 b/build/docker/CI/Dockerfile.win64
index 5ad53339a5..b0b7589a5e 100644
--- a/build/docker/CI/Dockerfile.win64
+++ b/build/docker/CI/Dockerfile.win64
@@ -2,9 +2,9 @@ FROM debian:testing
ARG XDG_DATA_HOME
# always run apt-get update and apt-get install in the same cachable layer
-RUN apt-get update && apt-get install -y --no-install-recommends \\
- build-essential cpio g++-mingw-w64-x86-64 gcc-mingw-w64-x86-64 git intltool \\
- libgdk-pixbuf2.0-dev libglib2.0-bin meson pkg-config python3 python3-distutils \\
+RUN apt-get update && apt-get install -y --no-install-recommends \
+ build-essential cpio g++-mingw-w64-x86-64 gcc-mingw-w64-x86-64 git intltool \
+ libgdk-pixbuf2.0-dev libglib2.0-bin meson pkg-config python3 python3-distutils \
python3-docutils python3-pip rpm wine wine64 xsltproc
# install crossroad
@@ -13,28 +13,28 @@ RUN git clone --depth=${GIT_DEPTH} git://git.tuxfamily.org/gitroot/crossroad/cro
RUN cd crossroad && ./setup.py install --prefix=/usr/local && cd ..
# install babl and GEGL dependencies with crossroad
-RUN echo "export XDG_DATA_HOME=$XDG_DATA_HOME && \\
- crossroad source msys2 && crossroad install lcms2 cairo json-glib' | \\
+RUN echo "export XDG_DATA_HOME=$XDG_DATA_HOME && \
+ crossroad source msys2 && crossroad install lcms2 cairo json-glib' | \
XDG_DATA_HOME=$XDG_DATA_HOME crossroad w64 gimp --run='-'"
# install GIMP dependencies with crossroad
-RUN echo 'export XDG_DATA_HOME=$XDG_DATA_HOME && crossroad source msys2 && \\
- crossroad install appstream-glib atk drmingw gexiv2 glib2 json-c ghostscript iso-codes \\
- libheif libmng libmypaint mypaint-brushes libwebp libwmf openexr ilmbase poppler poppler-data xpm-nox' |
\\
+RUN echo 'export XDG_DATA_HOME=$XDG_DATA_HOME && crossroad source msys2 && \
+ crossroad install appstream-glib atk drmingw gexiv2 glib2 json-c ghostscript iso-codes \
+ libheif libmng libmypaint mypaint-brushes libwebp libwmf openexr ilmbase poppler poppler-data xpm-nox' |
\
XDG_DATA_HOME=$XDG_DATA_HOME crossroad w64 gimp --run='-'
-# create gdk-pixbuf loaders.cache
-RUN echo 'export XDG_DATA_HOME=/usr/local/lib && \\
- export CROSSROAD_PREFIX=${XDG_DATA_HOME}/crossroad/roads/w64/gimp && \\
- wine ${XDG_DATA_HOME}/crossroad/roads/w64/gimp/bin/gdk-pixbuf-query-loaders.exe \\
- ${XDG_DATA_HOME}/crossroad/roads/w64/gimp/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll > \\
- ${XDG_DATA_HOME}/crossroad/roads/w64/gimp/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache' | \\
+# create gdk-pixbuf loaders.cache
+RUN echo 'export XDG_DATA_HOME=/usr/local/lib && \
+ export CROSSROAD_PREFIX=${XDG_DATA_HOME}/crossroad/roads/w64/gimp && \
+ wine ${XDG_DATA_HOME}/crossroad/roads/w64/gimp/bin/gdk-pixbuf-query-loaders.exe \
+ ${XDG_DATA_HOME}/crossroad/roads/w64/gimp/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll > \
+ ${XDG_DATA_HOME}/crossroad/roads/w64/gimp/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache' | \
XDG_DATA_HOME=$XDG_DATA_HOME crossroad w64 gimp --run='-'
-
+
# loaders.cache cleanup
-RUN echo 'sed -i "s&${XDG_DATA_HOME}/crossroad/roads/w64/gimp/&&" \\
- ${XDG_DATA_HOME}/crossroad/roads/w64/gimp/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache' | \\
+RUN echo 'sed -i "s&${XDG_DATA_HOME}/crossroad/roads/w64/gimp/&&" \
+ ${XDG_DATA_HOME}/crossroad/roads/w64/gimp/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache' | \
XDG_DATA_HOME=$XDG_DATA_HOME crossroad w64 gimp --run='-'
-RUN echo 'sed -i "/.dll\"/s*/*\\\\*g"
${XDG_DATA_HOME}/crossroad/roads/w64/gimp/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache' | \\
+RUN echo 'sed -i "/.dll\"/s*/*\\\\*g"
${XDG_DATA_HOME}/crossroad/roads/w64/gimp/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache' | \
XDG_DATA_HOME=$XDG_DATA_HOME crossroad w64 gimp --run='-'
\ No newline at end of file
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]