diff options
author | Christoph Reiter <reiter.christoph@gmail.com> | 2018-02-16 10:12:42 +0100 |
---|---|---|
committer | Christoph Reiter <reiter.christoph@gmail.com> | 2018-02-16 10:45:35 +0100 |
commit | 9c3cb6b49c33f53d637e80aad68a67e89d0eb944 (patch) | |
tree | d05d8cbcd700f678e8a179f090b85af9d6156e35 /.gitlab-ci | |
parent | 91a25c2aa1776e5e5757dc317a798615c31b3854 (diff) | |
download | pygobject-9c3cb6b49c33f53d637e80aad68a67e89d0eb944.tar.gz |
gitlab-ci: use ccache
Diffstat (limited to '.gitlab-ci')
-rw-r--r-- | .gitlab-ci/Dockerfile | 3 | ||||
-rwxr-xr-x | .gitlab-ci/run-docker.sh | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile index 4ce8927e..1dd8e2af 100644 --- a/.gitlab-ci/Dockerfile +++ b/.gitlab-ci/Dockerfile @@ -3,6 +3,7 @@ FROM ubuntu:artful RUN apt-get update && apt-get install -y \ autoconf-archive \ build-essential \ + ccache \ curl \ dbus \ gir1.2-gtk-3.0 \ @@ -41,3 +42,5 @@ RUN pyenv install 2.7.14 RUN pyenv install 3.4.7 RUN pyenv install 3.5.5 RUN pyenv install 3.6.4 + +ENV PATH="/usr/lib/ccache:${PATH}" diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh index e06e4d15..ec171120 100755 --- a/.gitlab-ci/run-docker.sh +++ b/.gitlab-ci/run-docker.sh @@ -1,7 +1,9 @@ #!/bin/bash -sudo docker build --build-arg HOST_USER_ID="$UID" --tag "pygobject" \ +TAG="lazka/pygobject:pyenv" + +sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \ --file "Dockerfile" . sudo docker run -e PYENV_VERSION='3.6.4' --rm \ --volume "$(pwd)/..:/home/user/app" --workdir "/home/user/app" \ - --tty --interactive "pygobject" bash + --tty --interactive "${TAG}" bash |