Skip to content

Commit 5826c8c

Browse files
1ambda1ambda
committed
fix: Use single dockerfile for tag push
1 parent 92e3abc commit 5826c8c

File tree

7 files changed

+23
-203
lines changed

7 files changed

+23
-203
lines changed

‎dev/change_zeppelin_version.sh‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
#
1919

2020
usage() {
21-
echo "usage) $0 [Old version] [New version]"
22-
echo " ex. $0 0.7.0-SNAPSHOT 0.7.0"
21+
echo "usage) $0 [OLD version] [NEW version]"
22+
echo " ex. $0 0.8.0-SNAPSHOT 0.8.0"
2323
exit 1
2424
}
2525

@@ -58,6 +58,9 @@ sed -i '' 's/-'"${FROM_VERSION}"'.jar",/-'"${TO_VERSION}"'.jar",/g' zeppelin-exa
5858
sed -i '' 's/"version": "'"${FROM_VERSION}"'",/"version": "'"${TO_VERSION}"'",/g' zeppelin-web/src/app/tabledata/package.json
5959
sed -i '' 's/"version": "'"${FROM_VERSION}"'",/"version": "'"${TO_VERSION}"'",/g' zeppelin-web/src/app/visualization/package.json
6060

61+
# Change version in Dockerfile
62+
sed -i '' 's/Z_VERSION="'"${FROM_VERSION}"'"/Z_VERSION="'"${TO_VERSION}"'"/g' scripts/docker/zeppelin/bin/Dockerfile
63+
6164
# When preparing new dev version from release tag, doesn't need to change docs version
6265
if is_dev_version "${FROM_VERSION}" || ! is_dev_version "${TO_VERSION}"; then
6366
# When prepare new rc for the maintenance release

‎scripts/docker/zeppelin/0.6.2/Dockerfile‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎scripts/docker/zeppelin/0.7.0/Dockerfile‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎scripts/docker/zeppelin/0.7.1/Dockerfile‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎scripts/docker/zeppelin/bin-template/Dockerfile‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

scripts/docker/zeppelin/base/Dockerfile renamed to scripts/docker/zeppelin/bin/Dockerfile

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@
1616
FROM ubuntu:16.04
1717
MAINTAINER Apache Software Foundation <[email protected]>
1818

19-
ENV LOG_TAG="[ZEPPELIN_BASE]:" \
19+
# `Z_VERSION` will be updated by `dev/change_zeppelin_version.sh`
20+
ENV Z_VERSION="0.8.0-SNAPSHOT"
21+
ENV LOG_TAG="[ZEPPELIN_${Z_VERSION}]:" \
22+
Z_HOME="/zeppelin" \
2023
LANG=en_US.UTF-8 \
2124
LC_ALL=en_US.UTF-8
2225

@@ -86,5 +89,18 @@ RUN echo "$LOG_TAG Install R related packages" && \
8689
R -e "install.packages('Rcpp', repos='http://cran.us.r-project.org')" && \
8790
Rscript -e "library('devtools'); library('Rcpp'); install_github('ramnathv/rCharts')"
8891

92+
RUN echo "$LOG_TAG Download Zeppelin binary" && \
93+
wget -O /tmp/zeppelin-${Z_VERSION}-bin-all.tgz http://archive.apache.org/dist/zeppelin/zeppelin-${Z_VERSION}/zeppelin-${Z_VERSION}-bin-all.tgz && \
94+
tar -zxvf /tmp/zeppelin-${Z_VERSION}-bin-all.tgz && \
95+
rm -rf /tmp/zeppelin-${Z_VERSION}-bin-all.tgz && \
96+
mv /zeppelin-${Z_VERSION}-bin-all ${Z_HOME}
97+
98+
RUN echo "$LOG_TAG Cleanup" && \
99+
apt-get autoclean && \
100+
apt-get clean
101+
102+
EXPOSE 8080
103+
89104
ENTRYPOINT [ "/usr/bin/tini", "--" ]
90-
CMD [ "/bin/bash" ]
105+
WORKDIR ${Z_HOME}
106+
CMD ["bin/zeppelin.sh"]

‎scripts/docker/zeppelin/create-dockerfile.sh‎

Lines changed: 0 additions & 51 deletions
This file was deleted.

0 commit comments

Comments
 (0)