diff options
-rw-r--r-- | Dockerfile | 22 | ||||
-rw-r--r-- | Dockerfile-build.sh | 22 |
2 files changed, 0 insertions, 44 deletions
diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 07bce1b67..000000000 --- a/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -# Docker image for running BuildStream -# ==================================== -# -# This image has BuildStream and its dependencies installed in /usr. -# See Dockerfile-build.sh for the full build instructions. -# -# To build it, run this command from the current directory: -# -# docker build --tag=buildstream:latest . -# -# The build takes a long time because it has to download lots of packages using -# DNF. - - -FROM fedora:26 - -ADD Dockerfile-build.sh /root/Dockerfile-build.sh -RUN bash /root/Dockerfile-build.sh - -# Work around https://github.com/fedora-cloud/docker-brew-fedora/issues/14 -ENV LANG C.UTF-8 -ENV LC_ALL C.UTF-8 diff --git a/Dockerfile-build.sh b/Dockerfile-build.sh deleted file mode 100644 index 2bed2c9f9..000000000 --- a/Dockerfile-build.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -# Shell script to set up the BuildStream Docker image. - -set -eu - -dnf update -y -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 "Installing latest BuildStream" -cd -git clone https://gitlab.com/BuildStream/buildstream.git ; cd buildstream -dnf install -y python3-devel -pip3 install . - -echo "Removing BuildStream build dependencies" -dnf remove -y python3-devel -dnf remove -y gcc redhat-rpm-config -dnf clean all |