[glib-networking/wip/tingping/pkcs11: 4/7] docker: Add dependencies for PKCS11 work

[Michael Catanzaro <mcatanzaro src gnome org>]

commit a0da3a2c3e801735a72b432ece893ccce22f0749
Author: Patrick Griffis <tingping tingping se>
Date:   Mon Oct 12 14:35:12 2020 -0500

    docker: Add dependencies for PKCS11 work
    
    - Use Fedora 33 as Rawhide is currently broken
    - Build glib 2.67 (master currently)
    - Add opensc for pkcs11-spy module

 .gitlab-ci.yml           |  2 +-
 .gitlab-ci/Dockerfile    | 14 +++++++++++---
 .gitlab-ci/run-docker.sh |  2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8f721c7..f36d384 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: registry.gitlab.gnome.org/gnome/glib-networking/master:v16
+image: registry.gitlab.gnome.org/gnome/glib-networking/master:v17
 
 fedora-x86_64:
   stage: build
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index 16a83d9..ef8fbb1 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -1,12 +1,20 @@
-FROM fedora:rawhide
+FROM fedora:33
 
 RUN dnf update -y \
     && dnf install -y 'dnf-command(builddep)' \
-    && dnf builddep -y glib-networking \
+    && dnf builddep -y glib-networking glib2 \
     && dnf install -y clang-analyzer \
                       libasan \
                       openssl-devel \
-    && dnf clean all
+                      git \
+                      opensc \
+    && dnf clean all \
+    && git clone https://gitlab.gnome.org/GNOME/glib.git \
+    && pushd glib \
+    && meson _build --prefix=/usr \
+    && meson install -C _build \
+    && popd \
+    && rm -rf glib
 
 ARG HOST_USER_ID=5555
 ENV HOST_USER_ID ${HOST_USER_ID}
diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh
index df24c9c..9cb1bcc 100755
--- a/.gitlab-ci/run-docker.sh
+++ b/.gitlab-ci/run-docker.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-TAG="registry.gitlab.gnome.org/gnome/glib-networking/master:v16"
+TAG="registry.gitlab.gnome.org/gnome/glib-networking/master:v17"
 
 cd "$(dirname "$0")"