[gimp/wip/schumaml/tune-prepare-stage: 45/55] build: commands to be executed in a Dockerfile work best if they are actually in the Dockerfile
- From: Michael Schumacher <schumaml src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/wip/schumaml/tune-prepare-stage: 45/55] build: commands to be executed in a Dockerfile work best if they are actually in the Dockerfile
- Date: Tue, 2 Jun 2020 20:37:01 +0000 (UTC)
commit b68c0bdb1bf6874a56669c9191f81ca519db699d
Author: Michael Schumacher <schumaml gmx de>
Date: Sat May 30 23:38:48 2020 +0200
build: commands to be executed in a Dockerfile work best if they are actually in the Dockerfile
.gitlab-ci.yml | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 39497b0105..68f09b8bde 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -55,14 +55,14 @@ build-image:
- echo "RUN git clone --depth=${GIT_DEPTH} git://git.tuxfamily.org/gitroot/crossroad/crossroad.git" >>
Dockerfile
- echo "RUN cd crossroad && ./setup.py install --prefix=/usr/local" >> Dockerfile
- - echo 'RUN echo "crossroad source msys2" > /usr/local/bin/crossroad_deps_install.sh'
- - echo 'RUN echo "crossroad install lcms2" >> /usr/local/bin/crossroad_deps_install.sh'
- - echo 'RUN echo "crossroad install cairo json-glib" >> /usr/local/bin/crossroad_deps_install.sh'
- - echo 'RUN echo "LIBMNG=" >> /usr/local/bin/crossroad_deps_install.sh'
- - echo 'RUN echo "if [ \"x$CROSSROAD_PLATFORM\" = \"xw64\" ]; then" >>
/usr/local/bin/crossroad_deps_install.sh'
- - echo 'RUN echo " LIBMNG="libmng" >> /usr/local/bin/crossroad_deps_install.sh'
- - echo 'RUN echo "fi" >> /usr/local/bin/crossroad_deps_install.sh'
- - echo 'RUN echo "crossroad install appstream-glib atk drmingw gexiv2 ghostscript glib2 iso-codes json-c
libheif libmypaint mypaint-brushes libwebp libwmf openexr ilmbase poppler poppler-data xpm-nox" >>
/usr/local/bin/crossroad_deps_install.sh'
+ - echo 'RUN echo "crossroad source msys2" > crossroad_deps_install.sh' >> Dockerfile
+ - echo 'RUN echo "crossroad install lcms2" >> crossroad_deps_install.sh' >> Dockerfile
+ - echo 'RUN echo "crossroad install cairo json-glib" >> crossroad_deps_install.sh' >> Dockerfile
+ - echo 'RUN echo "LIBMNG=" >> crossroad_deps_install.sh' >> Dockerfile
+ - echo 'RUN echo "if [ \"x$CROSSROAD_PLATFORM\" = \"xw64\" ]; then" >> crossroad_deps_install.sh' >>
Dockerfile
+ - echo 'RUN echo " LIBMNG="libmng" >> crossroad_deps_install.sh' >> Dockerfile
+ - echo 'RUN echo "fi" >> crossroad_deps_install.sh' >> Dockerfile
+ - echo 'RUN echo "crossroad install appstream-glib atk drmingw gexiv2 ghostscript glib2 iso-codes json-c
libheif libmypaint mypaint-brushes libwebp libwmf openexr ilmbase poppler poppler-data xpm-nox" >>
crossroad_deps_install.sh' >> Dockerfile
build-image-win64:
extends: .build-image-win-base
@@ -70,7 +70,7 @@ build-image-win64:
- echo "RUN apt-get install -y --no-install-recommends \\" >> Dockerfile
- echo "g++-mingw-w64-x86-64 gcc-mingw-w64-x86-64" >> Dockerfile
- - echo 'RUN crossroad w64 gimp --run="/usr/local/bin/crossroad_deps_install.sh"' >> Dockerfile
+ - echo 'RUN crossroad w64 gimp --run="crossroad_deps_install.sh"' >> Dockerfile
- /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination
$BUILD_IMAGE_WIN64 --cache=true --cache-ttl=120h
@@ -80,7 +80,7 @@ build-image-win32:
- echo "RUN apt-get install -y --no-install-recommends \\" >> Dockerfile
- echo "g++-mingw-w64-i686 gcc-mingw-w64-i686" >> Dockerfile
- - echo 'RUN crossroad w32 gimp --run="/usr/local/bin/crossroad_deps_install.sh"' >> Dockerfile
+ - echo 'RUN crossroad w32 gimp --run="crossroad_deps_install.sh"' >> Dockerfile
- /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination
$BUILD_IMAGE_WIN32 --cache=true --cache-ttl=120h
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]