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.

Sign up for GitHub

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

Jump to bottom

Use upstream zeppelin 0.5.5 release #17578

Merged
merged 1 commit into from
Nov 20, 2015
Merged

Use upstream zeppelin 0.5.5 release #17578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 3 additions & 6 deletions examples/spark/images/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ TAG = 1.5.1_v2

# To bump the Zeppelin version, bump the version in
# zeppelin/Dockerfile and bump this tag and reset to v1.
ZEPPELIN_TAG = v0.5.5_v2
ZEPPELIN_TAG = v0.5.5_v3

spark:
docker build -t gcr.io/google_containers/spark-base base
Expand All @@ -24,15 +24,12 @@ spark:
docker build -t gcr.io/google_containers/spark-driver driver
docker tag gcr.io/google_containers/spark-driver gcr.io/google_containers/spark-driver:$(TAG)

# This target is useful when needing to use an unreleased version of Zeppelin
zeppelin-build:
docker build -t gcr.io/google_containers/zeppelin-build zeppelin-build
docker tag -f gcr.io/google_containers/zeppelin-build gcr.io/google_containers/zeppelin-build:$(ZEPPELIN_TAG)

zeppelin: zeppelin-build
docker create --name=zeppelin-build-tmp gcr.io/google_containers/zeppelin-build:$(ZEPPELIN_TAG)
docker cp zeppelin-build-tmp:/zeppelin.tgz zeppelin
docker rm -f zeppelin-build-tmp

zeppelin:
docker build -t gcr.io/google_containers/zeppelin zeppelin
docker tag -f gcr.io/google_containers/zeppelin gcr.io/google_containers/zeppelin:$(ZEPPELIN_TAG)

Expand Down
11 changes: 9 additions & 2 deletions examples/spark/images/zeppelin/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,15 @@

FROM gcr.io/google_containers/spark-base:latest

# Expands to /opt/zeppelin/
ADD zeppelin.tgz /opt/
ENV ZEPPELIN_VER 0.5.5-incubating

RUN mkdir -p /opt && \
cd /opt && \
curl http://www.us.apache.org/dist/incubator/zeppelin/${ZEPPELIN_VER}/zeppelin-${ZEPPELIN_VER}-bin-all.tgz | \
tar -zx && \
ln -s zeppelin-${ZEPPELIN_VER}-bin-all zeppelin && \
echo Zeppelin ${ZEPPELIN_VER} installed in /opt

ADD zeppelin-log4j.properties /opt/zeppelin/conf/log4j.properties
ADD zeppelin-env.sh /opt/zeppelin/conf/zeppelin-env.sh
ADD docker-zeppelin.sh /opt/zeppelin/bin/docker-zeppelin.sh
Expand Down