Agustin Benito Bethencourt pushed to branch master at BuildStream / buildstream-docker-images
Commits:
5 changed files:
- .gitlab-ci.yml
- − testsuite/debian-8/Dockerfile
- − testsuite/debian-8/cleanup.sh
- − testsuite/debian-8/ostree.sh
- − testsuite/debian-8/prepare.sh
Changes:
| ... | ... | @@ -94,10 +94,9 @@ hadolint: |
| 94 | 94 |
scripts/build-image.sh -t buildstream/image-tools:${TAG_PREFIX}$(cat fixed_tag) -t buildstream/image-tools:${TAG_PREFIX}$(cat moving_tag) $push_needed image-tools
|
| 95 | 95 |
|
| 96 | 96 |
# Build test suite images (these don't need moving tags) (these don't need buildstream)
|
| 97 |
- scripts/build-image.sh -t buildstream/testsuite/debian:${TAG_PREFIX}8-$(cat fixed_tag) $push_needed testsuite/debian-8
|
|
| 98 |
- scripts/build-image.sh -t buildstream/testsuite/debian:${TAG_PREFIX}9-$(cat fixed_tag) $push_needed testsuite/debian-9
|
|
| 99 |
- scripts/build-image.sh -t buildstream/testsuite/ubuntu:${TAG_PREFIX}18-$(cat fixed_tag) $push_needed testsuite/ubuntu-18
|
|
| 100 |
- scripts/build-image.sh -t buildstream/testsuite/fedora:${TAG_PREFIX}27-$(cat fixed_tag) $push_needed testsuite/fedora-27
|
|
| 97 |
+ scripts/build-image.sh -t buildstream/testsuite-debian:${TAG_PREFIX}9-$(cat fixed_tag) $push_needed testsuite/debian-9
|
|
| 98 |
+ scripts/build-image.sh -t buildstream/testsuite-ubuntu:${TAG_PREFIX}18-$(cat fixed_tag) $push_needed testsuite/ubuntu-18
|
|
| 99 |
+ scripts/build-image.sh -t buildstream/testsuite-fedora:${TAG_PREFIX}27-$(cat fixed_tag) $push_needed testsuite/fedora-27
|
|
| 101 | 100 |
fi
|
| 102 | 101 |
|
| 103 | 102 |
build-and-maybe-push-x86_64:
|
| 1 |
-FROM debian:jessie-backports
|
|
| 2 |
- |
|
| 3 |
-COPY prepare.sh ostree.sh cleanup.sh /root/
|
|
| 4 |
- |
|
| 5 |
-RUN /bin/sh /root/prepare.sh && \
|
|
| 6 |
- /bin/sh /root/ostree.sh && \
|
|
| 7 |
- /bin/sh /root/cleanup.sh
|
|
| 8 |
- |
|
| 9 |
-# Work around a click issue
|
|
| 10 |
-ENV LANG C.UTF-8
|
|
| 11 |
-ENV LC_ALL C.UTF-8
|
| 1 |
-#!/bin/sh
|
|
| 2 |
- |
|
| 3 |
-set -eu
|
|
| 4 |
- |
|
| 5 |
-echo "Removing build dependencies"
|
|
| 6 |
- |
|
| 7 |
-if [ "$(uname -m)" != "x86_64" ]; then
|
|
| 8 |
- apt-get remove -y --purge g++ python3-dev
|
|
| 9 |
-fi
|
|
| 10 |
- |
|
| 11 |
-apt-get remove -y --purge bison libglib2.0-dev liblzma-dev e2fslibs-dev \
|
|
| 12 |
- libgirepository1.0-dev libgpgme11-dev libfuse-dev wget xz-utils \
|
|
| 13 |
- libicu52 libgtk2.0-common binutils
|
|
| 14 |
- |
|
| 15 |
-echo "Removing apt cache"
|
|
| 16 |
-apt-get clean
|
|
| 17 |
-rm -rf /var/lib/apt/lists
|
|
| 18 |
- |
|
| 19 |
-rm -R /root/*
|
| 1 |
-#!/bin/sh
|
|
| 2 |
- |
|
| 3 |
-# Ostree build dependencies
|
|
| 4 |
-apt-get install -y --no-install-recommends \
|
|
| 5 |
- bison libglib2.0-dev liblzma-dev e2fslibs-dev \
|
|
| 6 |
- libgirepository1.0-dev libgpgme11-dev libfuse-dev \
|
|
| 7 |
- libsoup2.4-dev wget xz-utils
|
|
| 8 |
- |
|
| 9 |
-# Build and install ostree
|
|
| 10 |
-cd ~ || exit 1
|
|
| 11 |
- |
|
| 12 |
-wget "https://github.com/ostreedev/ostree/releases/download/v2017.8/libostree-2017.8.tar.xz"
|
|
| 13 |
-tar xf libostree-2017.8.tar.xz
|
|
| 14 |
-cd libostree-2017.8 || exit 1
|
|
| 15 |
- |
|
| 16 |
-./configure --prefix=/usr --enable-introspection --with-soup
|
|
| 17 |
-make
|
|
| 18 |
-make install
|
| 1 |
-#!/bin/sh
|
|
| 2 |
- |
|
| 3 |
-set -eu
|
|
| 4 |
- |
|
| 5 |
-apt-get update
|
|
| 6 |
- |
|
| 7 |
-# BuildStream dependencies
|
|
| 8 |
-apt-get install -y --no-install-recommends \
|
|
| 9 |
- bash-completion bubblewrap bzr findutils fuse git lzip make \
|
|
| 10 |
- patch python3-pip python3-gi python3-ruamel.yaml python3-psutil
|
|
| 11 |
- |
|
| 12 |
-# grpcio needs to be built from source on architectures where no binary is available
|
|
| 13 |
-if [ "$(uname -m)" != "x86_64" ]; then
|
|
| 14 |
- apt-get install -y --no-install-recommends g++ python3-dev
|
|
| 15 |
-fi
|
|
| 16 |
- |
|
| 17 |
-# Debian-jessie is outdated enough that we need to use pip for these
|
|
| 18 |
-# dependencies; python3-gi and python3-ruamel.yaml however seem best
|
|
| 19 |
-# installed through the OS package
|
|
| 20 |
-pip3 install -U pip
|
|
| 21 |
- |
|
| 22 |
-# Use the new pip3 from /usr/local/bin
|
|
| 23 |
-hash -r
|
|
| 24 |
- |
|
| 25 |
-pip3 install arpy blessings click grpcio jinja2 markupsafe pluginbase protobuf
|
|
| 26 |
- |
|
| 27 |
-# Test suite dependencies
|
|
| 28 |
-pip3 install apipkg coverage==4.4.0 pytest-cov pytest-datafiles execnet \
|
|
| 29 |
- pytest-env pep8 pytest pytest-pep8 pytest-pylint pytest-xdist setuptools_scm \
|
|
| 30 |
- typing
|
|
| 31 |
-pip3 install -U setuptools
|