[librsvg-oci-images/add-curl-to-debian] rework the debian build




commit bc77763e1d1f9a57075ad639d36f863ee040846c
Author: Sven Neumann <sven svenfoo org>
Date:   Fri Oct 23 16:00:11 2020 +0200

    rework the debian build
    
    * Remove obselete ubuntu and i386 builds
    * Move the scripts inline the dockerfile
    * rename the dockerfile so syntax highliting in editors works
    * add openssl to the builddeps
    * remove ccache from the deps as its no longer used
    
    * Export GDK_PIXBUF_QUERYLOADERS var so autotools doesn't complain
    https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=907306
    
    * build the image with a usernamespace by default so it
    works with our unpriv gitlab runners
    similar to c19a8634d51985288c77ad491693f4c62bba6f95

 .gitlab-ci.yml            | 40 ++--------------------------------------
 debian/bionic             |  6 ------
 debian/cleanup.sh         |  9 ---------
 debian/i386_bionic        |  6 ------
 debian/i386_testing       |  6 ------
 debian/prepare.sh         | 13 -------------
 debian/testing            |  6 ------
 debian/testing.Dockerfile | 33 +++++++++++++++++++++++++++++++++
 8 files changed, 35 insertions(+), 84 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c75d9d5..1160867 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -68,13 +68,13 @@ fedora latest:
     changes:
       - 'fedora/*'
 
-.debian testing:
+debian testing:
   extends: '.distro build'
   variables:
     ARCH: "amd64"
     DISTRO_NAME: "debian"
     DISTRO_VER: "testing"
-    DOCKERFILE: "debian/testing"
+    DOCKERFILE: "debian/testing.Dockerfile"
     CONTEXT_DIR: "debian"
   only:
     changes:
@@ -92,39 +92,3 @@ opensuse tumbleweed:
     changes:
       - 'opensuse/*'
 
-.ubuntu 18.04 x86_64:
-  extends: '.distro build'
-  variables:
-    ARCH: "amd64"
-    DISTRO_NAME: "ubuntu"
-    DISTRO_VER: "18.04"
-    DOCKERFILE: "debian/bionic"
-    CONTEXT_DIR: "debian"
-  only:
-    changes:
-      - 'debian/*'
-
-.debian testing i386:
-  extends: '.distro build'
-  variables:
-    ARCH: "i386"
-    DISTRO_NAME: "debian"
-    DISTRO_VER: "testing"
-    DOCKERFILE: "debian/i386_testing"
-    CONTEXT_DIR: "debian"
-  only:
-    changes:
-      - 'debian/*'
-
-.ubuntu 18.04 i386:
-  extends: '.distro build'
-  variables:
-    ARCH: "i386"
-    DISTRO_NAME: "ubuntu"
-    DISTRO_VER: "18.04"
-    DOCKERFILE: "debian/i386_bionic"
-    CONTEXT_DIR: "debian"
-  only:
-    changes:
-      - 'debian/*'
-
diff --git a/debian/testing.Dockerfile b/debian/testing.Dockerfile
new file mode 100644
index 0000000..596681d
--- /dev/null
+++ b/debian/testing.Dockerfile
@@ -0,0 +1,33 @@
+FROM debian:testing
+
+RUN apt update -yqq \
+    && apt install -yqq --no-install-recommends \
+    curl gcc make valac rustc cargo git \
+    automake autoconf libtool gettext itstool \
+    libgdk-pixbuf2.0-dev libgirepository1.0-dev \
+    gtk-doc-tools libpango1.0-dev libgtk-3-dev \
+    libxml2-dev libcroco3-dev libcairo2-dev \
+    ca-certificates openssl libssl-dev \
+    autotools-dev libltdl-dev autopoint \
+    && apt clean \
+    && rm -rf /var/lib/apt/lists \
+    && cargo install cargo-c
+
+ENV SHELL=/bin/bash
+
+ENV HOST_USER_ID 5555
+RUN useradd -u $HOST_USER_ID -ms /bin/bash user
+
+USER user
+WORKDIR /home/user
+
+ENV LANG C.UTF-8
+
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=907306
+# export GDK_PIXBUF_QUERYLOADERS=/usr/lib/$(dpkg-architecture 
-qDEB_HOST_MULTIARCH)/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders
+ENV GDK_PIXBUF_QUERYLOADERS /usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders
+
+# Make sure the build works \o/
+# RUN git clone --depth 1 https://gitlab.gnome.org/GNOME/librsvg.git \
+#     && cd librsvg && mkdir _build && cd _build \
+#     && ../autogen.sh && make && make check


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]