[glib-networking] ci: Add Dockerfile
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib-networking] ci: Add Dockerfile
- Date: Tue, 11 Dec 2018 18:15:04 +0000 (UTC)
commit 90c18fe312fd7a434d2bf382b78ae4c3bec704fa
Author: Xavier Claessens <xavier claessens collabora com>
Date: Mon Dec 10 14:29:56 2018 -0500
ci: Add Dockerfile
It is a waste of time to reinstall all fedora packages for each job.
Copy and adapt Dockerfile and scripts from glib.
.gitlab-ci.yml | 27 +++++++++++----------------
.gitlab-ci/Dockerfile | 18 ++++++++++++++++++
.gitlab-ci/README.md | 23 +++++++++++++++++++++++
.gitlab-ci/run-docker.sh | 18 ++++++++++++++++++
4 files changed, 70 insertions(+), 16 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6fe7d95..10bd9f9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,21 +1,16 @@
-image: fedora:29
+image: registry.gitlab.gnome.org/gnome/glib-networking/master:v1
-variables:
- ADDITIONAL_DEPENDENCIES: gsettings-desktop-schemas gcc libasan
-
-build_stable:
- before_script:
- - dnf update -y --nogpgcheck
- - dnf install -y 'dnf-command(builddep)'
- - dnf builddep -y --nogpgcheck glib-networking
- - dnf install -y --nogpgcheck $ADDITIONAL_DEPENDENCIES
+fedora-x86_64:
script:
- - mkdir build
- - cd build
- - meson .. -Db_sanitize=address
- - ninja
- - ninja test
- - ninja install
+ - meson --prefix=$HOME/glib-networking-installed
+ -Db_sanitize=address
+ -Dgnutls=enabled
+ -Dlibproxy=enabled
+ -Dgnome_proxy=enabled
+ build/
+ - ninja -C build/
+ - ninja -C build/ test
+ - ninja -C build/ install
artifacts:
paths:
- build/test-results
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
new file mode 100644
index 0000000..bdd9063
--- /dev/null
+++ b/.gitlab-ci/Dockerfile
@@ -0,0 +1,18 @@
+FROM fedora:29
+
+RUN dnf update -y \
+ && dnf install -y 'dnf-command(builddep)' \
+ && dnf builddep -y glib-networking \
+ && dnf install -y gsettings-desktop-schemas \
+ gcc \
+ libasan \
+ && dnf clean all
+
+ARG HOST_USER_ID=5555
+ENV HOST_USER_ID ${HOST_USER_ID}
+RUN useradd -u $HOST_USER_ID -ms /bin/bash user
+
+USER user
+WORKDIR /home/user
+
+ENV LANG C.UTF-8
diff --git a/.gitlab-ci/README.md b/.gitlab-ci/README.md
new file mode 100644
index 0000000..41dfd75
--- /dev/null
+++ b/.gitlab-ci/README.md
@@ -0,0 +1,23 @@
+# CI support stuff
+
+## Docker image
+
+GitLab CI jobs run in a Docker image, defined here. To update that image
+(perhaps to install some more packages):
+
+1. Edit `.gitlab-ci/Dockerfile` with the changes you want
+2. Edit `.gitlab-ci/run-docker.sh` and bump the version in `TAG`
+3. Run `.gitlab-ci/run-docker.sh` to build the new image, and launch a shell
+ inside it
+ * When you're done, exit the shell in the usual way
+4. Run `.gitlab-ci/run-docker.sh --push` to upload the new image to the GNOME
+ GitLab Docker registry
+ * If this is the first time you're doing this, you'll need to log into the
+ registry
+ * If you use 2-factor authentication on your GNOME GitLab account, you'll
+ need to [create a personal access token][pat] and use that rather than
+ your normal password
+5. Edit `.gitlab-ci.yml` (in the root of this repository) to use your new
+ image
+
+[pat]: https://gitlab.gnome.org/profile/personal_access_tokens
diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh
new file mode 100755
index 0000000..5dc5584
--- /dev/null
+++ b/.gitlab-ci/run-docker.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -e
+
+TAG="registry.gitlab.gnome.org/gnome/glib-networking/master:v1"
+
+cd "$(dirname "$0")"
+docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \
+ --file "Dockerfile" .
+
+if [ "$1" = "--push" ]; then
+ docker login registry.gitlab.gnome.org
+ docker push $TAG
+else
+ docker run --rm \
+ --volume "$(pwd)/..:/home/user/app" --workdir "/home/user/app" \
+ --tty --interactive "${TAG}" bash
+fi
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]