mirror of
https://gitlab.freedesktop.org/libinput/libinput.git
synced 2025-12-27 09:10:06 +01:00
CI: remove the bootstrapping stage
We want to have a common repo for the containers templates.
So we can reuse the produced image from this repo and remove our custom
bootstrap image.
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
(cherry picked from commit 93cec9197a)
This commit is contained in:
Benjamin Tissoires
Peter Hutterer
parent
cbbac5ebd0
commit
64d1fa77d4
2 changed files with 5 additions and 171 deletions
|
|
@ -25,7 +25,6 @@
|
|||
# e.g. fedora:29@build-default
|
||||
|
||||
stages:
|
||||
- bootstrapping # creates the initial container image (optional)
|
||||
- container_check # check if the current container images are up to date
|
||||
- container_prep # rebuild the container images if previous step failed
|
||||
- build # for actually building things
|
||||
|
|
@ -54,6 +53,7 @@ variables:
|
|||
# We do not use CI_PROJECT_NAMESPACE or CI_REGISTRY_IMAGE because we want
|
||||
# forks to use these particular images
|
||||
PROJECT_NAMESPACE: libinput
|
||||
BUILDAH_IMAGE: $CI_REGISTRY/wayland/ci-templates/buildah:latest
|
||||
FEDORA_CONTAINER_IMAGE: $CI_REGISTRY/$PROJECT_NAMESPACE/$CI_PROJECT_NAME/fedora/$FEDORA_VERSION
|
||||
UBUNTU_CONTAINER_IMAGE: $CI_REGISTRY/$PROJECT_NAMESPACE/$CI_PROJECT_NAME/ubuntu/$UBUNTU_VERSION
|
||||
ARCH_CONTAINER_IMAGE: $CI_REGISTRY/$PROJECT_NAMESPACE/$CI_PROJECT_NAME/arch/rolling
|
||||
|
|
@ -94,29 +94,6 @@ variables:
|
|||
# Note: this is a set of logical OR, not AND
|
||||
- $CI_PROJECT_PATH == "libinput/libinput"
|
||||
|
||||
#################################################################
|
||||
# #
|
||||
# bootstrapping stage #
|
||||
# #
|
||||
#################################################################
|
||||
|
||||
# we need a minimalist image capable of buildah, podman, skopeo, curl,
|
||||
# jq, date and test. Instead of using a full fedora and install the
|
||||
# dependencies, we can build an alpine container through buildah with
|
||||
# the script at `ci/bootstrap.sh`
|
||||
bootstrap:
|
||||
stage: bootstrapping
|
||||
when: manual
|
||||
image: $CI_REGISTRY/$PROJECT_NAMESPACE/$CI_PROJECT_NAME/containers:latest
|
||||
script:
|
||||
- podman login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
|
||||
- bash ci/bootstrap.sh $CI_REGISTRY/$PROJECT_NAMESPACE/$CI_PROJECT_NAME/containers:latest
|
||||
- podman images
|
||||
- podman push --quiet $CI_REGISTRY/$PROJECT_NAMESPACE/$CI_PROJECT_NAME/containers:latest
|
||||
# add an extra tag to the docker registry:
|
||||
- skopeo copy docker://$CI_REGISTRY/$PROJECT_NAMESPACE/$CI_PROJECT_NAME/containers:latest docker://$CI_REGISTRY/$PROJECT_NAMESPACE/$CI_PROJECT_NAME/containers:$CI_JOB_ID
|
||||
<<: *restrict_container_creation
|
||||
|
||||
#################################################################
|
||||
# #
|
||||
# container check stage #
|
||||
|
|
@ -125,7 +102,7 @@ bootstrap:
|
|||
|
||||
.container-check:
|
||||
stage: container_check
|
||||
image: $CI_REGISTRY/$PROJECT_NAMESPACE/$CI_PROJECT_NAME/containers:latest
|
||||
image: $BUILDAH_IMAGE
|
||||
script:
|
||||
# get the full container image name (CURRENT_CONTAINER_IMAGE still has indirections)
|
||||
- CONTAINER_IMAGE=$(eval echo "$CURRENT_CONTAINER_IMAGE")
|
||||
|
|
@ -208,7 +185,7 @@ freebsd:11.2@container-check:
|
|||
|
||||
.container-prep:
|
||||
stage: container_prep
|
||||
image: $CI_REGISTRY/$PROJECT_NAMESPACE/$CI_PROJECT_NAME/containers:latest
|
||||
image: $BUILDAH_IMAGE
|
||||
before_script:
|
||||
# if the check was successful, we just skip recreating the container image
|
||||
- test -e .img_ready && exit 0
|
||||
|
|
@ -388,7 +365,7 @@ freebsd:11.2@force-container-prep:
|
|||
#
|
||||
.container-clean:
|
||||
stage: container_check
|
||||
image: $CI_REGISTRY/$PROJECT_NAMESPACE/$CI_PROJECT_NAME/containers:latest
|
||||
image: $BUILDAH_IMAGE
|
||||
script:
|
||||
# get the full container image name (CURRENT_CONTAINER_IMAGE still has indirections)
|
||||
- CONTAINER_IMAGE=$(eval echo "$CURRENT_CONTAINER_IMAGE")
|
||||
|
|
@ -438,12 +415,6 @@ freebsd:11.2@force-container-prep:
|
|||
allow_failure: true
|
||||
<<: *restrict_container_creation
|
||||
|
||||
bootstrap@container-clean:
|
||||
extends: .container-clean
|
||||
variables:
|
||||
GIT_STRATEGY: none
|
||||
CURRENT_CONTAINER_IMAGE: $CI_REGISTRY/$PROJECT_NAMESPACE/$CI_PROJECT_NAME/containers
|
||||
|
||||
fedora:28@container-clean:
|
||||
extends: .container-clean
|
||||
variables:
|
||||
|
|
@ -654,7 +625,7 @@ freebsd:11.2@default-build:
|
|||
#
|
||||
|
||||
wayland-web:
|
||||
image: $CI_REGISTRY/$PROJECT_NAMESPACE/$CI_PROJECT_NAME/containers:latest
|
||||
image: $BUILDAH_IMAGE
|
||||
stage: deploy
|
||||
script:
|
||||
- curl --request POST
|
||||
|
|
|
|||
137
ci/bootstrap.sh
137
ci/bootstrap.sh
|
|
@ -1,137 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
# build container
|
||||
|
||||
set -o xtrace
|
||||
|
||||
TAG=$1
|
||||
|
||||
cat > /etc/containers/storage.conf <<EOF
|
||||
[storage]
|
||||
driver = "vfs"
|
||||
EOF
|
||||
|
||||
buildcntr1=$(buildah from --quiet golang:alpine)
|
||||
buildmnt1=$(buildah mount $buildcntr1)
|
||||
|
||||
buildah run $buildcntr1 apk add --update \
|
||||
--no-cache \
|
||||
--repository http://dl-3.alpinelinux.org/alpine/edge/testing/ \
|
||||
bash git make gcc musl-dev glib-dev ostree-dev \
|
||||
bats bzip2 python3-dev \
|
||||
gpgme-dev linux-headers btrfs-progs-dev \
|
||||
libselinux-dev lvm2-dev libseccomp-dev
|
||||
|
||||
# build runc
|
||||
buildah run $buildcntr1 go get github.com/opencontainers/runc
|
||||
buildah config --workingdir /go/src/github.com/opencontainers/runc/ $buildcntr1
|
||||
buildah run $buildcntr1 bash -c 'make'
|
||||
buildah run $buildcntr1 bash -c 'make install'
|
||||
|
||||
# build skopeo
|
||||
buildah run $buildcntr1 git clone --depth 1 --branch master https://github.com/containers/skopeo /go/src/github.com/containers/skopeo
|
||||
buildah config --workingdir /go/src/github.com/containers/skopeo/ $buildcntr1
|
||||
buildah run $buildcntr1 bash -c 'make binary-local'
|
||||
|
||||
# build libpod
|
||||
buildah run $buildcntr1 git clone --depth 1 --branch master https://github.com/containers/libpod /go/src/github.com/containers/libpod
|
||||
buildah config --workingdir /go/src/github.com/containers/libpod/ $buildcntr1
|
||||
buildah run $buildcntr1 bash -c 'make install.tools'
|
||||
buildah run $buildcntr1 bash -c 'make'
|
||||
buildah run $buildcntr1 bash -c 'make install'
|
||||
|
||||
# build buildah
|
||||
buildah run $buildcntr1 git clone --depth 1 --branch master https://github.com/containers/buildah /go/src/github.com/containers/buildah
|
||||
buildah config --workingdir /go/src/github.com/containers/buildah/ $buildcntr1
|
||||
buildah run $buildcntr1 bash -c 'make install.tools'
|
||||
buildah run $buildcntr1 bash -c 'make'
|
||||
buildah run $buildcntr1 bash -c 'make install'
|
||||
|
||||
# build conmon
|
||||
buildah run $buildcntr1 git clone --depth 1 --branch master https://github.com/kubernetes-sigs/cri-o /go/src/github.com/kubernetes-sigs/cri-o
|
||||
buildah config --workingdir /go/src/github.com/kubernetes-sigs/cri-o/ $buildcntr1
|
||||
buildah run $buildcntr1 bash -c 'make install.tools'
|
||||
buildah run $buildcntr1 bash -c 'make'
|
||||
buildah run $buildcntr1 bash -c 'make install'
|
||||
|
||||
|
||||
buildcntr2=$(buildah from --quiet alpine:latest)
|
||||
buildmnt2=$(buildah mount $buildcntr2)
|
||||
buildah run $buildcntr2 apk add --update \
|
||||
--no-cache \
|
||||
--repository http://dl-3.alpinelinux.org/alpine/edge/testing/ \
|
||||
bash jq curl glib gpgme ostree lvm2 libselinux libseccomp \
|
||||
iptables ip6tables
|
||||
cp $buildmnt1/usr/local/sbin/runc $buildmnt2/usr/sbin/runc
|
||||
cp $buildmnt1/go/src/github.com/containers/skopeo/skopeo $buildmnt2/usr/bin/skopeo
|
||||
cp $buildmnt1/usr/local/bin/podman $buildmnt2/usr/bin/podman
|
||||
cp $buildmnt1/usr/local/bin/buildah $buildmnt2/usr/bin/buildah
|
||||
cp $buildmnt1/usr/local/bin/crio $buildmnt2/usr/bin/crio
|
||||
mkdir $buildmnt2/usr/libexec/crio
|
||||
cp $buildmnt1/usr/local/libexec/crio/conmon $buildmnt2/usr/libexec/crio/conmon
|
||||
cp $buildmnt1/usr/local/libexec/crio/pause $buildmnt2/usr/libexec/crio/pause
|
||||
|
||||
mkdir $buildmnt2/etc/containers
|
||||
|
||||
cat > $buildmnt2/etc/containers/registries.conf <<EOF
|
||||
# This is a system-wide configuration file used to
|
||||
# keep track of registries for various container backends.
|
||||
# It adheres to TOML format and does not support recursive
|
||||
# lists of registries.
|
||||
|
||||
# The default location for this configuration file is /etc/containers/registries.conf.
|
||||
|
||||
# The only valid categories are: 'registries.search', 'registries.insecure',
|
||||
# and 'registries.block'.
|
||||
|
||||
[registries.search]
|
||||
registries = ['docker.io', 'registry.fedoraproject.org', 'quay.io', 'registry.centos.org']
|
||||
|
||||
# If you need to access insecure registries, add the registry's fully-qualified name.
|
||||
# An insecure registry is one that does not have a valid SSL certificate or only does HTTP.
|
||||
[registries.insecure]
|
||||
registries = []
|
||||
|
||||
|
||||
# If you need to block pull access from a registry, uncomment the section below
|
||||
# and add the registries fully-qualified name.
|
||||
#
|
||||
# Docker only
|
||||
[registries.block]
|
||||
registries = []
|
||||
EOF
|
||||
|
||||
cat > $buildmnt2/etc/containers/policy.json <<EOF
|
||||
{
|
||||
"default": [
|
||||
{
|
||||
"type": "insecureAcceptAnything"
|
||||
}
|
||||
],
|
||||
"transports":
|
||||
{
|
||||
"docker-daemon":
|
||||
{
|
||||
"": [{"type":"insecureAcceptAnything"}]
|
||||
}
|
||||
}
|
||||
}
|
||||
EOF
|
||||
|
||||
cat > $buildmnt2/etc/containers/storage.conf <<EOF
|
||||
# This file is is the configuration file for all tools
|
||||
# that use the containers/storage library.
|
||||
# See man 5 containers-storage.conf for more information
|
||||
# The "container storage" table contains all of the server options.
|
||||
[storage]
|
||||
|
||||
# Default Storage Driver
|
||||
driver = "vfs"
|
||||
EOF
|
||||
|
||||
buildah unmount $buildcntr2
|
||||
buildah commit --quiet $buildcntr2 $TAG
|
||||
|
||||
#clean up build
|
||||
|
||||
buildah rm $buildcntr1 $buildcntr2
|
||||
Loading…
Add table
Reference in a new issue