diff options
| author | Justin Erenkrantz <justin@erenkrantz.com> | 2017-07-30 14:38:11 +0100 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2017-08-03 17:00:41 +0100 |
| commit | 8563bdbe8eaa20236ca619b9a446219d793f5da0 (patch) | |
| tree | 233963930fcac293104ff56ad9d94d33f9fda05d | |
| parent | 572967bf67bbaa46deb8be63be702407374f8a5b (diff) | |
| download | buildstream-8563bdbe8eaa20236ca619b9a446219d793f5da0.tar.gz | |
Update Dockerfile to fc26 as it has a fixed ostree.
| -rw-r--r-- | Dockerfile | 4 | ||||
| -rw-r--r-- | Dockerfile-build.sh | 25 |
2 files changed, 3 insertions, 26 deletions
diff --git a/Dockerfile b/Dockerfile index ff83d0a31..07bce1b67 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,10 +9,10 @@ # docker build --tag=buildstream:latest . # # The build takes a long time because it has to download lots of packages using -# DNF and also build OSTree from source. +# DNF. -FROM fedora:25 +FROM fedora:26 ADD Dockerfile-build.sh /root/Dockerfile-build.sh RUN bash /root/Dockerfile-build.sh diff --git a/Dockerfile-build.sh b/Dockerfile-build.sh index 16564ee6b..15d1de4f9 100644 --- a/Dockerfile-build.sh +++ b/Dockerfile-build.sh @@ -3,36 +3,13 @@ set -eu -# We currently need a very new version of OSTree to work around some -# regressions. Once a release containing this commit is in the Fedora -# package repositories we can go back to installing OSTree with `dnf`. -OSTREE_COMMIT=9a79d13ce307d8b5b2fe0c373c5d778ad7128b5a - dnf update -y -dnf install -y bubblewrap git python3-gobject bzr +dnf install -y bubblewrap git python3-gobject bzr ostree # redhat-rpm-config seems to be needed to avoid some weird error, see: # https://stackoverflow.com/questions/41925585/ dnf install -y gcc redhat-rpm-config -echo "Building OSTree commit $OSTREE_COMMIT" -cd -dnf install -y autoconf automake bison e2fsprogs-devel fuse-devel glib2-devel gobject-introspection-devel gpgme-devel libsoup-devel libtool openssl-devel which xz-devel zlib-devel -mkdir ostree-build ; cd ostree-build -git clone https://github.com/ostreedev/ostree ; cd ostree -git checkout $OSTREE_COMMIT -NOCONFIGURE=1 ./autogen.sh -mkdir o ; cd o -../configure --prefix=/usr -make -j 4 -make install - -echo "Removing OSTree build dependencies" -cd -rm -r ostree-build -dnf remove -y autoconf automake bison e2fsprogs-devel fuse-devel glib2-devel gobject-introspection-devel gpgme-devel libsoup-devel libtool openssl-devel which xz-devel zlib-devel -dnf install -y libsoup - echo "Installing latest BuildStream" cd git clone https://gitlab.com/BuildStream/buildstream.git ; cd buildstream |