From a19952f75e18fd2c0dd29ab6bb694e70cd020455 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Sun, 29 Apr 2018 23:30:02 +0200
Subject: ci: update image to bionic; drop Python 3.4

We require Ubuntu 16.04+ which has 3.5
---
 .gitlab-ci/Dockerfile    | 7 +------
 .gitlab-ci/run-docker.sh | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

(limited to '.gitlab-ci')

diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index c1af1ce4..4b457a0b 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -1,7 +1,6 @@
-FROM ubuntu:artful
+FROM ubuntu:bionic
 
 RUN apt-get update && apt-get install -y \
-    autoconf-archive \
     build-essential \
     ccache \
     curl \
@@ -17,10 +16,7 @@ RUN apt-get update && apt-get install -y \
     libglib2.0-dev \
     libgtk-3-0 \
     libreadline-dev \
-    libsqlite3-dev \
     libssl-dev \
-    libtool \
-    locales \
     xauth \
     xvfb \
     && rm -rf /var/lib/apt/lists/*
@@ -40,7 +36,6 @@ ENV PATH="${PYENV_ROOT}/shims:${PYENV_ROOT}/bin:${PATH}"
 RUN curl -L https://raw.githubusercontent.com/pyenv/pyenv-installer/master/bin/pyenv-installer | bash
 
 RUN pyenv install 2.7.14
-RUN pyenv install 3.4.8
 RUN pyenv install 3.5.5
 RUN pyenv install 3.6.5
 RUN pyenv install 3.7.0b3
diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh
index 818f3628..6f4f428c 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/pygobject/main:v4"
+TAG="registry.gitlab.gnome.org/gnome/pygobject/main:v5"
 
 sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \
     --file "Dockerfile" .
-- 
cgit v1.2.1