Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for Zeppelin 0.8.0-hadoop-2.8.0-spark-2.3.1 #4

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
up:
docker network create spark-net
docker-compose build
docker-compose up
docker-compose up -d

down:
docker-compose down
Expand All @@ -12,8 +12,8 @@ bash:

run:
docker build -t zeppelin ./zeppelin/.
docker run -it --rm --net spark-net -p 80:8080 -v $(shell pwd)/notebook:/opt/zeppelin/notebook -v $(shell pwd)/zeppelin-0.7.2-bin-all:/opt/zeppelin zeppelin /bin/bash
docker run -it --rm --net spark-net -p 80:8080 -v $(shell pwd)/notebook:/opt/zeppelin/notebook -v $(shell pwd)/zeppelin-0.8.0-bin-all:/opt/zeppelin zeppelin /bin/bash
#docker run -it --rm --net spark-net -p 80:8080 -v $(shell pwd)/notebook:/opt/zeppelin/notebook zeppelin /opt/zeppelin/bin/zeppelin.sh

build:
docker build -t earthquakesan/zeppelin:0.7.2 ./zeppelin/.
docker build -t bde2020/zeppelin:0.8.0 ./zeppelin/.
33 changes: 9 additions & 24 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ services:
- CORE_CONF_fs_defaultFS=hdfs://namenode:8020
healthcheck:
interval: 5s
retries: 100
retries: 100
networks:
- spark-net
datanode:
Expand All @@ -22,43 +22,30 @@ services:
environment:
- CORE_CONF_fs_defaultFS=hdfs://namenode:8020
depends_on:
namenode:
condition: service_healthy
healthcheck:
interval: 5s
retries: 100
- namenode
networks:
- spark-net
spark-master:
image: bde2020/spark-master:2.1.0-hadoop2.8-hive-java8
image: bde2020/spark-master:2.3.1-hadoop2.8
container_name: spark-master
ports:
- "8080:8080"
- "7077:7077"
environment:
- CORE_CONF_fs_defaultFS=hdfs://namenode:8020
depends_on:
namenode:
condition: service_healthy
datanode:
condition: service_healthy
healthcheck:
interval: 5s
retries: 100
- namenode
- datanode
networks:
- spark-net
spark-worker:
image: bde2020/spark-worker:2.1.0-hadoop2.8-hive-java8
image: bde2020/spark-worker:2.3.1-hadoop2.8
environment:
- "SPARK_MASTER=spark://spark-master:7077"
environment:
- CORE_CONF_fs_defaultFS=hdfs://namenode:8020
depends_on:
spark-master:
condition: service_healthy
healthcheck:
interval: 5s
retries: 100
- spark-master
networks:
- spark-net
zeppelin:
Expand All @@ -73,10 +60,8 @@ services:
MASTER: "spark://spark-master:7077"
#SPARK_SUBMIT_OPTIONS: "--jars /opt/sansa-examples/jars/sansa-examples-spark-2016-12.jar"
depends_on:
spark-master:
condition: service_healthy
namenode:
condition: service_healthy
- spark-master
- namenode
networks:
- spark-net

Expand Down
11 changes: 6 additions & 5 deletions zeppelin/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
FROM bde2020/spark-base:2.1.0-hadoop2.8-hive-java8
FROM bde2020/spark-base:2.3.1-hadoop2.8
MAINTAINER Ivan Ermilov <ivan.s.ermilov@gmail.com>
MAINTAINER Gezim Sejdiu <g.sejdiu@gmail.com>

ENV APACHE_SPARK_VERSION 2.1.0
ENV APACHE_SPARK_VERSION 2.3.1
ENV APACHE_HADOOP_VERSION 2.8.0
ENV ZEPPELIN_VERSION 0.7.2
ENV ZEPPELIN_VERSION 0.8.0

RUN apt-get update && apt-get install wget
RUN set -x \
&& curl -fSL "http://www-eu.apache.org/dist/zeppelin/zeppelin-0.7.2/zeppelin-0.7.2-bin-all.tgz" -o /tmp/zeppelin.tgz \
&& curl -fSL "http://www-eu.apache.org/dist/zeppelin/zeppelin-${ZEPPELIN_VERSION}/zeppelin-${ZEPPELIN_VERSION}-bin-all.tgz" -o /tmp/zeppelin.tgz \
&& tar -xzvf /tmp/zeppelin.tgz -C /opt/ \
&& mv /opt/zeppelin-* /opt/zeppelin \
&& rm /tmp/zeppelin.tgz

ENV SPARK_SUBMIT_OPTIONS "--jars /opt/zeppelin/sansa-examples-spark-2016-12.jar"
ENV SPARK_SUBMIT_OPTIONS "--jars /opt/zeppelin/sansa-examples-spark-2018-06.jar"

WORKDIR /opt/zeppelin

Expand Down