[gimp/wip/schumaml/crossraods-optimization: 46/76] gitlab-ci: make sure apt-get upgrade and apt-get install are in the same cache layer
- From: Michael Schumacher <schumaml src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/wip/schumaml/crossraods-optimization: 46/76] gitlab-ci: make sure apt-get upgrade and apt-get install are in the same cache layer
- Date: Sun, 6 Dec 2020 00:44:39 +0000 (UTC)
commit ad20889acc46d8688b46f0a22cc1e8e2f39eac76
Author: Michael Schumacher <schumaml gmx de>
Date: Thu Dec 3 11:40:31 2020 +0100
gitlab-ci: make sure apt-get upgrade and apt-get install are in the same cache layer
.gitlab-ci.yml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c3d8b1e3d9..5dc704d2dc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -46,8 +46,8 @@ build-image-win64:
- mkdir -p /kaniko/.docker
- echo
"{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}"
/kaniko/.docker/config.json
- echo "FROM debian:testing" > Dockerfile
- - echo "RUN apt-get update" >> Dockerfile
- - echo "RUN apt-get install -y --no-install-recommends \\" >> Dockerfile
+# - echo "RUN apt-get update" >> Dockerfile
+ - echo "RUN apt-get update && apt-get install -y --no-install-recommends \\" >> Dockerfile
- echo "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" >> Dockerfile
# install crossroad
- echo "RUN pip3 install zstandard" >> Dockerfile
@@ -73,8 +73,8 @@ build-image-win32:
- mkdir -p /kaniko/.docker
- echo
"{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}"
/kaniko/.docker/config.json
- echo "FROM debian:testing" > Dockerfile
- - echo "RUN apt-get update" >> Dockerfile
- - echo "RUN apt-get install -y --no-install-recommends \\" >> Dockerfile
+# - echo "RUN apt-get update" >> Dockerfile
+ - echo "RUN apt-get update && apt-get install -y --no-install-recommends \\" >> Dockerfile
- echo "build-essential cpio g++-mingw-w64-i686 gcc-mingw-w64-i686 git intltool libgdk-pixbuf2.0-dev
libglib2.0-bin meson pkg-config python3 python3-distutils python3-docutils python3-pip rpm wine xsltproc" >>
Dockerfile
# install crossroad
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]