CI: use wayland ci-templates repo to create the base image
There shouldn't be a difference for users, but this way we do manage
all of our containers from freedesktop.org
note: compared to the provious Dockerfile, we need to manually
add gcc, g++ and python*-wheel
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
This commit is contained in:
Benjamin Tissoires
Michel Dänzer
parent
7be26976b8
commit
7f8a9a1fbb
|
|
@ -16,9 +16,15 @@
|
|||
# The format of the tag is "%Y-%m-%d-${counter}" where ${counter} stays
|
||||
# at "01" unless you have multiple updates on the same day :)
|
||||
variables:
|
||||
UBUNTU_TAG: 2019-03-05-01
|
||||
UBUNTU_IMAGE: "$CI_REGISTRY_IMAGE/ubuntu:$UBUNTU_TAG"
|
||||
UBUNTU_IMAGE_MAIN: "registry.freedesktop.org/mesa/mesa/ubuntu:$UBUNTU_TAG"
|
||||
UPSTREAM_REPO: mesa/mesa
|
||||
UBUNTU_TAG: "2019-04-02"
|
||||
UBUNTU_VERSION: bionic
|
||||
UBUNTU_IMAGE: "$CI_REGISTRY_IMAGE/ubuntu/$UBUNTU_VERSION:$UBUNTU_TAG"
|
||||
|
||||
include:
|
||||
- project: 'wayland/ci-templates'
|
||||
ref: c73dae8b84697ef18e2dbbf4fed7386d9652b0cd
|
||||
file: '/templates/ubuntu.yml'
|
||||
|
||||
stages:
|
||||
- containers-build
|
||||
|
|
@ -26,7 +32,7 @@ stages:
|
|||
|
||||
|
||||
# When to automatically run the CI
|
||||
.ci-run-policy:
|
||||
.ci-run-policy: &ci-run-policy
|
||||
only:
|
||||
- master
|
||||
- merge_requests
|
||||
|
|
@ -40,33 +46,18 @@ stages:
|
|||
# CONTAINERS
|
||||
|
||||
ubuntu:
|
||||
extends: .ci-run-policy
|
||||
extends: .ubuntu@container-ifnot-exists
|
||||
stage: containers-build
|
||||
image: docker:stable
|
||||
services:
|
||||
- docker:dind
|
||||
<<: *ci-run-policy
|
||||
variables:
|
||||
DOCKER_HOST: tcp://docker:2375
|
||||
DOCKER_DRIVER: overlay2
|
||||
script:
|
||||
# Enable experimental features such as `docker manifest inspect`
|
||||
- mkdir -p ~/.docker
|
||||
- "echo '{\"experimental\": \"enabled\"}' > ~/.docker/config.json"
|
||||
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
|
||||
# Check if the image (with the specific tag) already exists
|
||||
- docker manifest inspect $UBUNTU_IMAGE && exit || true
|
||||
# Try to re-use the image from the main repository's registry
|
||||
- docker image pull $UBUNTU_IMAGE_MAIN &&
|
||||
docker image tag $UBUNTU_IMAGE_MAIN $UBUNTU_IMAGE &&
|
||||
docker image push $UBUNTU_IMAGE && exit || true
|
||||
- docker build -t $UBUNTU_IMAGE -f .gitlab-ci/Dockerfile.ubuntu .
|
||||
- docker push $UBUNTU_IMAGE
|
||||
GIT_STRATEGY: none # no need to pull the whole tree for rebuilding the image
|
||||
UBUNTU_EXEC: 'bash .gitlab-ci/ubuntu-install.sh'
|
||||
|
||||
|
||||
# BUILD
|
||||
|
||||
.build:
|
||||
extends: .ci-run-policy
|
||||
<<: *ci-run-policy
|
||||
image: $UBUNTU_IMAGE
|
||||
stage: build+test
|
||||
cache:
|
||||
|
|
|
|||
|
|
@ -1,158 +0,0 @@
|
|||
FROM ubuntu:bionic
|
||||
|
||||
RUN apt-get update
|
||||
RUN apt-get upgrade -y
|
||||
RUN apt-get install -y \
|
||||
curl \
|
||||
wget \
|
||||
gnupg \
|
||||
software-properties-common
|
||||
|
||||
RUN curl -fsSL https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
|
||||
RUN add-apt-repository "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-7 main"
|
||||
|
||||
RUN apt-get update
|
||||
RUN apt-get install -y \
|
||||
pkg-config \
|
||||
libdrm-dev \
|
||||
libpciaccess-dev \
|
||||
libxrandr-dev \
|
||||
libxdamage-dev \
|
||||
libxfixes-dev \
|
||||
libxshmfence-dev \
|
||||
libxxf86vm-dev \
|
||||
libvdpau-dev \
|
||||
libva-dev \
|
||||
llvm-3.9-dev \
|
||||
libclang-3.9-dev \
|
||||
llvm-5.0-dev \
|
||||
llvm-6.0-dev \
|
||||
llvm-7-dev \
|
||||
clang-5.0 \
|
||||
libclang-5.0-dev \
|
||||
clang-6.0 \
|
||||
libclang-6.0-dev \
|
||||
clang-7 \
|
||||
libclang-7-dev \
|
||||
libclc-dev \
|
||||
libxvmc-dev \
|
||||
libomxil-bellagio-dev \
|
||||
xz-utils \
|
||||
libexpat1-dev \
|
||||
libx11-xcb-dev \
|
||||
x11proto-xf86vidmode-dev \
|
||||
libelf-dev \
|
||||
libunwind8-dev \
|
||||
libglvnd-dev \
|
||||
python2.7 \
|
||||
python-pip \
|
||||
python-setuptools \
|
||||
python3.5 \
|
||||
python3-pip \
|
||||
python3-setuptools \
|
||||
ninja-build
|
||||
|
||||
RUN apt-get install -y \
|
||||
libxcb-randr0
|
||||
|
||||
# autotools build deps
|
||||
RUN apt-get install -y \
|
||||
autoconf \
|
||||
automake \
|
||||
xutils-dev \
|
||||
libtool \
|
||||
bison \
|
||||
flex \
|
||||
gettext \
|
||||
make
|
||||
|
||||
# dependencies where we want a specific version
|
||||
ENV XORG_RELEASES https://xorg.freedesktop.org/releases/individual
|
||||
ENV XCB_RELEASES https://xcb.freedesktop.org/dist
|
||||
ENV WAYLAND_RELEASES https://wayland.freedesktop.org/releases
|
||||
|
||||
ENV XORGMACROS_VERSION util-macros-1.19.0
|
||||
ENV GLPROTO_VERSION glproto-1.4.17
|
||||
ENV DRI2PROTO_VERSION dri2proto-2.8
|
||||
ENV LIBPCIACCESS_VERSION libpciaccess-0.13.4
|
||||
ENV LIBDRM_VERSION libdrm-2.4.97
|
||||
ENV XCBPROTO_VERSION xcb-proto-1.13
|
||||
ENV RANDRPROTO_VERSION randrproto-1.3.0
|
||||
ENV LIBXRANDR_VERSION libXrandr-1.3.0
|
||||
ENV LIBXCB_VERSION libxcb-1.13
|
||||
ENV LIBXSHMFENCE_VERSION libxshmfence-1.3
|
||||
ENV LIBVDPAU_VERSION libvdpau-1.1
|
||||
ENV LIBVA_VERSION libva-1.7.0
|
||||
ENV LIBWAYLAND_VERSION wayland-1.15.0
|
||||
ENV WAYLAND_PROTOCOLS_VERSION wayland-protocols-1.8
|
||||
|
||||
RUN wget $XORG_RELEASES/util/$XORGMACROS_VERSION.tar.bz2
|
||||
RUN tar -xvf $XORGMACROS_VERSION.tar.bz2 && rm $XORGMACROS_VERSION.tar.bz2
|
||||
RUN (cd $XORGMACROS_VERSION && ./configure && make install) && rm -rf $XORGMACROS_VERSION
|
||||
|
||||
RUN wget $XORG_RELEASES/proto/$GLPROTO_VERSION.tar.bz2
|
||||
RUN tar -xvf $GLPROTO_VERSION.tar.bz2 && rm $GLPROTO_VERSION.tar.bz2
|
||||
RUN (cd $GLPROTO_VERSION && ./configure && make install) && rm -rf $GLPROTO_VERSION
|
||||
|
||||
RUN wget $XORG_RELEASES/proto/$DRI2PROTO_VERSION.tar.bz2
|
||||
RUN tar -xvf $DRI2PROTO_VERSION.tar.bz2 && rm $DRI2PROTO_VERSION.tar.bz2
|
||||
RUN (cd $DRI2PROTO_VERSION && ./configure && make install) && rm -rf $DRI2PROTO_VERSION
|
||||
|
||||
RUN wget $XCB_RELEASES/$XCBPROTO_VERSION.tar.bz2
|
||||
RUN tar -xvf $XCBPROTO_VERSION.tar.bz2 && rm $XCBPROTO_VERSION.tar.bz2
|
||||
RUN (cd $XCBPROTO_VERSION && ./configure && make install) && rm -rf $XCBPROTO_VERSION
|
||||
|
||||
RUN wget $XCB_RELEASES/$LIBXCB_VERSION.tar.bz2
|
||||
RUN tar -xvf $LIBXCB_VERSION.tar.bz2 && rm $LIBXCB_VERSION.tar.bz2
|
||||
RUN (cd $LIBXCB_VERSION && ./configure && make install) && rm -rf $LIBXCB_VERSION
|
||||
|
||||
RUN wget $XORG_RELEASES/lib/$LIBPCIACCESS_VERSION.tar.bz2
|
||||
RUN tar -xvf $LIBPCIACCESS_VERSION.tar.bz2 && rm $LIBPCIACCESS_VERSION.tar.bz2
|
||||
RUN (cd $LIBPCIACCESS_VERSION && ./configure && make install) && rm -rf $LIBPCIACCESS_VERSION
|
||||
|
||||
RUN wget https://dri.freedesktop.org/libdrm/$LIBDRM_VERSION.tar.bz2
|
||||
RUN tar -xvf $LIBDRM_VERSION.tar.bz2 && rm $LIBDRM_VERSION.tar.bz2
|
||||
RUN (cd $LIBDRM_VERSION && ./configure --enable-vc4 --enable-freedreno --enable-etnaviv-experimental-api && make install) && rm -rf $LIBDRM_VERSION
|
||||
|
||||
RUN wget $XORG_RELEASES/proto/$RANDRPROTO_VERSION.tar.bz2
|
||||
RUN tar -xvf $RANDRPROTO_VERSION.tar.bz2 && rm $RANDRPROTO_VERSION.tar.bz2
|
||||
RUN (cd $RANDRPROTO_VERSION && ./configure && make install) && rm -rf $RANDRPROTO_VERSION
|
||||
|
||||
RUN wget $XORG_RELEASES/lib/$LIBXRANDR_VERSION.tar.bz2
|
||||
RUN tar -xvf $LIBXRANDR_VERSION.tar.bz2 && rm $LIBXRANDR_VERSION.tar.bz2
|
||||
RUN (cd $LIBXRANDR_VERSION && ./configure && make install) && rm -rf $LIBXRANDR_VERSION
|
||||
|
||||
RUN wget $XORG_RELEASES/lib/$LIBXSHMFENCE_VERSION.tar.bz2
|
||||
RUN tar -xvf $LIBXSHMFENCE_VERSION.tar.bz2 && rm $LIBXSHMFENCE_VERSION.tar.bz2
|
||||
RUN (cd $LIBXSHMFENCE_VERSION && ./configure && make install) && rm -rf $LIBXSHMFENCE_VERSION
|
||||
|
||||
RUN wget https://people.freedesktop.org/~aplattner/vdpau/$LIBVDPAU_VERSION.tar.bz2
|
||||
RUN tar -xvf $LIBVDPAU_VERSION.tar.bz2 && rm $LIBVDPAU_VERSION.tar.bz2
|
||||
RUN (cd $LIBVDPAU_VERSION && ./configure && make install) && rm -rf $LIBVDPAU_VERSION
|
||||
|
||||
RUN wget https://www.freedesktop.org/software/vaapi/releases/libva/$LIBVA_VERSION.tar.bz2
|
||||
RUN tar -xvf $LIBVA_VERSION.tar.bz2 && rm $LIBVA_VERSION.tar.bz2
|
||||
RUN (cd $LIBVA_VERSION && ./configure --disable-wayland --disable-dummy-driver && make install) && rm -rf $LIBVA_VERSION
|
||||
|
||||
RUN wget $WAYLAND_RELEASES/$LIBWAYLAND_VERSION.tar.xz
|
||||
RUN tar -xvf $LIBWAYLAND_VERSION.tar.xz && rm $LIBWAYLAND_VERSION.tar.xz
|
||||
RUN (cd $LIBWAYLAND_VERSION && ./configure --enable-libraries --without-host-scanner --disable-documentation --disable-dtd-validation && make install) && rm -rf $LIBWAYLAND_VERSION
|
||||
|
||||
RUN wget $WAYLAND_RELEASES/$WAYLAND_PROTOCOLS_VERSION.tar.xz
|
||||
RUN tar -xvf $WAYLAND_PROTOCOLS_VERSION.tar.xz && rm $WAYLAND_PROTOCOLS_VERSION.tar.xz
|
||||
RUN (cd $WAYLAND_PROTOCOLS_VERSION && ./configure && make install) && rm -rf $WAYLAND_PROTOCOLS_VERSION
|
||||
|
||||
RUN pip3 install 'meson>=0.49'
|
||||
RUN pip2 install 'scons>=2.4'
|
||||
|
||||
RUN pip2 install mako
|
||||
RUN pip3 install mako
|
||||
|
||||
# Use ccache to speed up builds
|
||||
RUN apt-get install -y ccache
|
||||
|
||||
# We need xmllint to validate the XML files in Mesa
|
||||
RUN apt-get install -y libxml2-utils
|
||||
|
||||
# Cleanup workdir
|
||||
WORKDIR /
|
||||
|
|
@ -0,0 +1,162 @@
|
|||
#!/bin/bash
|
||||
|
||||
set -e
|
||||
set -o xtrace
|
||||
|
||||
export DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
apt-get install -y \
|
||||
curl \
|
||||
wget \
|
||||
gnupg \
|
||||
software-properties-common
|
||||
|
||||
curl -fsSL https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
|
||||
add-apt-repository "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-7 main"
|
||||
|
||||
apt-get update
|
||||
apt-get install -y \
|
||||
pkg-config \
|
||||
libdrm-dev \
|
||||
libpciaccess-dev \
|
||||
libxrandr-dev \
|
||||
libxdamage-dev \
|
||||
libxfixes-dev \
|
||||
libxshmfence-dev \
|
||||
libxxf86vm-dev \
|
||||
libvdpau-dev \
|
||||
libva-dev \
|
||||
llvm-3.9-dev \
|
||||
libclang-3.9-dev \
|
||||
llvm-5.0-dev \
|
||||
llvm-6.0-dev \
|
||||
llvm-7-dev \
|
||||
clang-5.0 \
|
||||
libclang-5.0-dev \
|
||||
clang-6.0 \
|
||||
libclang-6.0-dev \
|
||||
g++ \
|
||||
gcc \
|
||||
clang-7 \
|
||||
libclang-7-dev \
|
||||
libclc-dev \
|
||||
libxvmc-dev \
|
||||
libomxil-bellagio-dev \
|
||||
xz-utils \
|
||||
libexpat1-dev \
|
||||
libx11-xcb-dev \
|
||||
x11proto-xf86vidmode-dev \
|
||||
libelf-dev \
|
||||
libunwind8-dev \
|
||||
libglvnd-dev \
|
||||
python2.7 \
|
||||
python-pip \
|
||||
python-setuptools \
|
||||
python-wheel \
|
||||
python3.5 \
|
||||
python3-pip \
|
||||
python3-setuptools \
|
||||
python3-wheel \
|
||||
ninja-build
|
||||
|
||||
apt-get install -y \
|
||||
libxcb-randr0
|
||||
|
||||
# autotools build deps
|
||||
apt-get install -y \
|
||||
autoconf \
|
||||
automake \
|
||||
xutils-dev \
|
||||
libtool \
|
||||
bison \
|
||||
flex \
|
||||
gettext \
|
||||
make
|
||||
|
||||
# dependencies where we want a specific version
|
||||
export XORG_RELEASES=https://xorg.freedesktop.org/releases/individual
|
||||
export XCB_RELEASES=https://xcb.freedesktop.org/dist
|
||||
export WAYLAND_RELEASES=https://wayland.freedesktop.org/releases
|
||||
|
||||
export XORGMACROS_VERSION=util-macros-1.19.0
|
||||
export GLPROTO_VERSION=glproto-1.4.17
|
||||
export DRI2PROTO_VERSION=dri2proto-2.8
|
||||
export LIBPCIACCESS_VERSION=libpciaccess-0.13.4
|
||||
export LIBDRM_VERSION=libdrm-2.4.97
|
||||
export XCBPROTO_VERSION=xcb-proto-1.13
|
||||
export RANDRPROTO_VERSION=randrproto-1.3.0
|
||||
export LIBXRANDR_VERSION=libXrandr-1.3.0
|
||||
export LIBXCB_VERSION=libxcb-1.13
|
||||
export LIBXSHMFENCE_VERSION=libxshmfence-1.3
|
||||
export LIBVDPAU_VERSION=libvdpau-1.1
|
||||
export LIBVA_VERSION=libva-1.7.0
|
||||
export LIBWAYLAND_VERSION=wayland-1.15.0
|
||||
export WAYLAND_PROTOCOLS_VERSION=wayland-protocols-1.8
|
||||
|
||||
wget $XORG_RELEASES/util/$XORGMACROS_VERSION.tar.bz2
|
||||
tar -xvf $XORGMACROS_VERSION.tar.bz2 && rm $XORGMACROS_VERSION.tar.bz2
|
||||
(cd $XORGMACROS_VERSION && ./configure && make install) && rm -rf $XORGMACROS_VERSION
|
||||
|
||||
wget $XORG_RELEASES/proto/$GLPROTO_VERSION.tar.bz2
|
||||
tar -xvf $GLPROTO_VERSION.tar.bz2 && rm $GLPROTO_VERSION.tar.bz2
|
||||
(cd $GLPROTO_VERSION && ./configure && make install) && rm -rf $GLPROTO_VERSION
|
||||
|
||||
wget $XORG_RELEASES/proto/$DRI2PROTO_VERSION.tar.bz2
|
||||
tar -xvf $DRI2PROTO_VERSION.tar.bz2 && rm $DRI2PROTO_VERSION.tar.bz2
|
||||
(cd $DRI2PROTO_VERSION && ./configure && make install) && rm -rf $DRI2PROTO_VERSION
|
||||
|
||||
wget $XCB_RELEASES/$XCBPROTO_VERSION.tar.bz2
|
||||
tar -xvf $XCBPROTO_VERSION.tar.bz2 && rm $XCBPROTO_VERSION.tar.bz2
|
||||
(cd $XCBPROTO_VERSION && ./configure && make install) && rm -rf $XCBPROTO_VERSION
|
||||
|
||||
wget $XCB_RELEASES/$LIBXCB_VERSION.tar.bz2
|
||||
tar -xvf $LIBXCB_VERSION.tar.bz2 && rm $LIBXCB_VERSION.tar.bz2
|
||||
(cd $LIBXCB_VERSION && ./configure && make install) && rm -rf $LIBXCB_VERSION
|
||||
|
||||
wget $XORG_RELEASES/lib/$LIBPCIACCESS_VERSION.tar.bz2
|
||||
tar -xvf $LIBPCIACCESS_VERSION.tar.bz2 && rm $LIBPCIACCESS_VERSION.tar.bz2
|
||||
(cd $LIBPCIACCESS_VERSION && ./configure && make install) && rm -rf $LIBPCIACCESS_VERSION
|
||||
|
||||
wget https://dri.freedesktop.org/libdrm/$LIBDRM_VERSION.tar.bz2
|
||||
tar -xvf $LIBDRM_VERSION.tar.bz2 && rm $LIBDRM_VERSION.tar.bz2
|
||||
(cd $LIBDRM_VERSION && ./configure --enable-vc4 --enable-freedreno --enable-etnaviv-experimental-api && make install) && rm -rf $LIBDRM_VERSION
|
||||
|
||||
wget $XORG_RELEASES/proto/$RANDRPROTO_VERSION.tar.bz2
|
||||
tar -xvf $RANDRPROTO_VERSION.tar.bz2 && rm $RANDRPROTO_VERSION.tar.bz2
|
||||
(cd $RANDRPROTO_VERSION && ./configure && make install) && rm -rf $RANDRPROTO_VERSION
|
||||
|
||||
wget $XORG_RELEASES/lib/$LIBXRANDR_VERSION.tar.bz2
|
||||
tar -xvf $LIBXRANDR_VERSION.tar.bz2 && rm $LIBXRANDR_VERSION.tar.bz2
|
||||
(cd $LIBXRANDR_VERSION && ./configure && make install) && rm -rf $LIBXRANDR_VERSION
|
||||
|
||||
wget $XORG_RELEASES/lib/$LIBXSHMFENCE_VERSION.tar.bz2
|
||||
tar -xvf $LIBXSHMFENCE_VERSION.tar.bz2 && rm $LIBXSHMFENCE_VERSION.tar.bz2
|
||||
(cd $LIBXSHMFENCE_VERSION && ./configure && make install) && rm -rf $LIBXSHMFENCE_VERSION
|
||||
|
||||
wget https://people.freedesktop.org/~aplattner/vdpau/$LIBVDPAU_VERSION.tar.bz2
|
||||
tar -xvf $LIBVDPAU_VERSION.tar.bz2 && rm $LIBVDPAU_VERSION.tar.bz2
|
||||
(cd $LIBVDPAU_VERSION && ./configure && make install) && rm -rf $LIBVDPAU_VERSION
|
||||
|
||||
wget https://www.freedesktop.org/software/vaapi/releases/libva/$LIBVA_VERSION.tar.bz2
|
||||
tar -xvf $LIBVA_VERSION.tar.bz2 && rm $LIBVA_VERSION.tar.bz2
|
||||
(cd $LIBVA_VERSION && ./configure --disable-wayland --disable-dummy-driver && make install) && rm -rf $LIBVA_VERSION
|
||||
|
||||
wget $WAYLAND_RELEASES/$LIBWAYLAND_VERSION.tar.xz
|
||||
tar -xvf $LIBWAYLAND_VERSION.tar.xz && rm $LIBWAYLAND_VERSION.tar.xz
|
||||
(cd $LIBWAYLAND_VERSION && ./configure --enable-libraries --without-host-scanner --disable-documentation --disable-dtd-validation && make install) && rm -rf $LIBWAYLAND_VERSION
|
||||
|
||||
wget $WAYLAND_RELEASES/$WAYLAND_PROTOCOLS_VERSION.tar.xz
|
||||
tar -xvf $WAYLAND_PROTOCOLS_VERSION.tar.xz && rm $WAYLAND_PROTOCOLS_VERSION.tar.xz
|
||||
(cd $WAYLAND_PROTOCOLS_VERSION && ./configure && make install) && rm -rf $WAYLAND_PROTOCOLS_VERSION
|
||||
|
||||
pip3 install 'meson>=0.49'
|
||||
pip2 install 'scons>=2.4'
|
||||
|
||||
pip2 install mako
|
||||
pip3 install mako
|
||||
|
||||
# Use ccache to speed up builds
|
||||
apt-get install -y ccache
|
||||
|
||||
# We need xmllint to validate the XML files in Mesa
|
||||
apt-get install -y libxml2-utils
|
||||
Loading…
Reference in New Issue