From 9ac391e64c4b95d70ca94b8213dc72aa7568f2a3 Mon Sep 17 00:00:00 2001 From: Axel Mannhardt Date: Thu, 17 Mar 2016 12:20:18 +0100 Subject: [PATCH] fix docker username and lib dep --- docker-testsetup/container/hadoop-env/Dockerfile | 2 +- docker-testsetup/container/hadoop/Dockerfile | 2 +- docker-testsetup/container/java/Dockerfile | 2 +- docker-testsetup/container/task-distribution-base/Dockerfile | 4 +++- .../container/task-distribution-example/Dockerfile | 2 +- docker-testsetup/container/task-distribution/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/docker-testsetup/container/hadoop-env/Dockerfile b/docker-testsetup/container/hadoop-env/Dockerfile index 88ab6e9..444585c 100644 --- a/docker-testsetup/container/hadoop-env/Dockerfile +++ b/docker-testsetup/container/hadoop-env/Dockerfile @@ -1,4 +1,4 @@ -FROM axm/hadoop +FROM michaxm/hadoop ENV HADOOP_PREFIX /usr/local/hadoop ENV HADOOP_COMMON_HOME /usr/local/hadoop diff --git a/docker-testsetup/container/hadoop/Dockerfile b/docker-testsetup/container/hadoop/Dockerfile index fc2106f..ef8522c 100644 --- a/docker-testsetup/container/hadoop/Dockerfile +++ b/docker-testsetup/container/hadoop/Dockerfile @@ -1,4 +1,4 @@ -FROM axm/java +FROM michaxm/java RUN curl -s http://ftp.halifax.rwth-aachen.de/apache/hadoop/common/hadoop-2.7.1/hadoop-2.7.1.tar.gz | tar -xz -C /usr/local RUN cd /usr/local && ln -s ./hadoop-2.7.1 hadoop diff --git a/docker-testsetup/container/java/Dockerfile b/docker-testsetup/container/java/Dockerfile index 1be84a4..bffb80e 100644 --- a/docker-testsetup/container/java/Dockerfile +++ b/docker-testsetup/container/java/Dockerfile @@ -1,4 +1,4 @@ -FROM axm/base-extended +FROM michaxm/base-extended RUN \ echo "===> add webupd8 repository..." && \ echo "deb http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main" | tee /etc/apt/sources.list.d/webupd8team-java.list && \ diff --git a/docker-testsetup/container/task-distribution-base/Dockerfile b/docker-testsetup/container/task-distribution-base/Dockerfile index 5091121..d084e28 100644 --- a/docker-testsetup/container/task-distribution-base/Dockerfile +++ b/docker-testsetup/container/task-distribution-base/Dockerfile @@ -1,4 +1,6 @@ -FROM axm/hadoop-env +FROM michaxm/hadoop-env + +RUN apt-get update && apt-get upgrade -y && apt-get install libbz2-dev #setup & rarely changing dependencies RUN cd /usr/local && git clone https://github.com/michaxm/task-distribution.git diff --git a/docker-testsetup/container/task-distribution-example/Dockerfile b/docker-testsetup/container/task-distribution-example/Dockerfile index 508cf80..2c4a3bc 100644 --- a/docker-testsetup/container/task-distribution-example/Dockerfile +++ b/docker-testsetup/container/task-distribution-example/Dockerfile @@ -1,4 +1,4 @@ -FROM axm/task-distribution +FROM michaxm/task-distribution #hdfs filtering example ADD example.bash /usr/local/task-distribution/example.bash diff --git a/docker-testsetup/container/task-distribution/Dockerfile b/docker-testsetup/container/task-distribution/Dockerfile index b5400c9..38c5f72 100644 --- a/docker-testsetup/container/task-distribution/Dockerfile +++ b/docker-testsetup/container/task-distribution/Dockerfile @@ -1,4 +1,4 @@ -FROM axm/task-distribution-base +FROM michaxm/task-distribution-base #provide scripts for starting name/datanodes (see docker-compose) ADD start-datanode.bash /usr/local/bin/start-datanode.bash