diff options
| author | Arnstein Ressem <aressem@yahoo-inc.com> | 2016-06-21 16:48:25 +0200 |
|---|---|---|
| committer | Arnstein Ressem <aressem@yahoo-inc.com> | 2016-06-21 16:48:25 +0200 |
| commit | 9ac578694a81e2de0539e22d05e373c8e87adbcf (patch) | |
| tree | fdf97354cf6cc492b8c43865b1732e5d032e44b2 /docker | |
| parent | 37ab232dca8f5accf2ce2a5f8ca1f62b64212da0 (diff) | |
| parent | f815e76f99fcd846d8a8d6aca17286c7dc6bdbcc (diff) | |
Merge branch 'aressem/add-docker-files-for-build-and-run' of github.com:yahoo/vespa into aressem/add-docker-files-for-build-and-run
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile.build | 2 | ||||
| -rw-r--r-- | docker/Dockerfile.run | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docker/Dockerfile.build b/docker/Dockerfile.build index 0ca151b1a02..540febba5b5 100644 --- a/docker/Dockerfile.build +++ b/docker/Dockerfile.build @@ -20,7 +20,7 @@ RUN yum -y install rpm-build RUN yum -y install make # Install vespa dependencies -RUN curl -o /etc/yum.repos.d/vespa-deps.repo https://copr.fedorainfracloud.org/coprs/g/vespa/vespa/repo/epel-7/group_vespa-vespa-epel-7.repo +RUN yum-config-manager --add-repo https://copr.fedorainfracloud.org/coprs/g/vespa/vespa/repo/epel-7/group_vespa-vespa-epel-7.repo RUN yum -y install vespa-boost-devel RUN yum -y install vespa-libtorrent-devel RUN yum -y install vespa-zookeeper-c-client-devel diff --git a/docker/Dockerfile.run b/docker/Dockerfile.run index 57eb747bc5a..7ea01cc3983 100644 --- a/docker/Dockerfile.run +++ b/docker/Dockerfile.run @@ -16,7 +16,7 @@ RUN yum -y install perl-JSON RUN yum -y install libatomic # Install vespa dependencies -RUN curl -o /etc/yum.repos.d/vespa-deps.repo https://copr.fedorainfracloud.org/coprs/g/vespa/vespa/repo/epel-7/group_vespa-vespa-epel-7.repo +RUN yum-config-manager --add-repo https://copr.fedorainfracloud.org/coprs/g/vespa/vespa/repo/epel-7/group_vespa-vespa-epel-7.repo RUN yum -y install vespa-boost RUN yum -y install vespa-libtorrent RUN yum -y install vespa-zookeeper-c-client |