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

chore: remove log4j libraries #39

Merged
merged 4 commits into from
Nov 30, 2023
Merged
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
15 changes: 0 additions & 15 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,6 @@ jobs:
strategy:
matrix:
version:
- zeppelin: "0.10.1"
spark: "3.1.3"
hadoop: "3.2.0"
scala: "2.12"
java: "8"
- zeppelin: "0.10.1"
spark: "3.2.2"
hadoop: "3.3.1"
scala: "2.12"
java: "8"
- zeppelin: "0.10.1"
spark: "3.3.0"
hadoop: "3.3.2"
scala: "2.12"
java: "8"
- zeppelin: "0.10.1"
spark: "3.4.1"
hadoop: "3.3.4"
Expand Down
26 changes: 1 addition & 25 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,31 +30,6 @@ RUN set -euo pipefail && \
rm zeppelin-${ZEPPELIN_VERSION}-bin-netinst.tgz; \
:

# Install GitHub Release Assets FUSE mount CLI (requires fuse install)
ARG GHAFS_VERSION="v0.1.3"
RUN set -euo pipefail && \
wget https://github.com/guangie88/ghafs/releases/download/${GHAFS_VERSION}/ghafs-${GHAFS_VERSION}-linux-amd64.tar.gz; \
tar xvf ghafs-${GHAFS_VERSION}-linux-amd64.tar.gz; \
rm ghafs-${GHAFS_VERSION}-linux-amd64.tar.gz; \
mv ./ghafs /usr/local/bin/; \
ghafs --version; \
:

# `buji-pac4j-4.1.1.jar` is the last tested working jar for Zeppelin (every version after this redirects to /null for OAuth2.0 some reason)
# Install `buji-pac4j` and `pac4j-oauth` to support OIDC / OAuth2.0 login
# We do not add / change shiro-* jars because the Zeppelin >= 0.10.1 uses shiro-* 1.7.0, which is sufficient for the above two dependencies
RUN set -euo pipefail && \
wget -P ${ZEPPELIN_HOME}/lib/ https://repo1.maven.org/maven2/io/buji/buji-pac4j/4.1.1/buji-pac4j-4.1.1.jar; \
# https://github.com/bujiio/buji-pac4j/blob/buji-pac4j-4.1.1/pom.xml#L86:
# pac4j stated to be 3.7.0, but 3.9.0 is tested to work
wget -P ${ZEPPELIN_HOME}/lib/ https://repo1.maven.org/maven2/org/pac4j/pac4j-core/3.9.0/pac4j-core-3.9.0.jar; \
wget -P ${ZEPPELIN_HOME}/lib/ https://repo1.maven.org/maven2/org/pac4j/pac4j-oauth/3.9.0/pac4j-oauth-3.9.0.jar; \
# https://github.com/pac4j/pac4j/blob/pac4j-3.9.0/pac4j-oauth/pom.xml#L16:
# scribejava stated to be 5.6.0, and we follow
wget -P ${ZEPPELIN_HOME}/lib/ https://repo1.maven.org/maven2/com/github/scribejava/scribejava-apis/5.6.0/scribejava-apis-5.6.0.jar; \
wget -P ${ZEPPELIN_HOME}/lib/ https://repo1.maven.org/maven2/com/github/scribejava/scribejava-core/5.6.0/scribejava-core-5.6.0.jar; \
:

RUN set -euo pipefail && \
# Install tera-cli for runtime interpolation
wget https://github.com/guangie88/tera-cli/releases/download/v0.4.1/tera-cli-v0.4.1-x86_64-unknown-linux-musl.tar.gz; \
Expand All @@ -75,6 +50,7 @@ USER zeppelin
# Entrypoint-ish env vars to apply config templates
ENV ZEPPELIN_APPLY_INTERPRETER_JSON "true"
ENV ZEPPELIN_APPLY_ZEPPELIN_SITE "true"
ENV ZEPPELIN_SPARK_ENABLESUPPORTEDVERSIONCHECK = "false"
ENV ZEPPELIN_APPLY_SHIRO "true"

# Env var not expanded without Dockerfile, so need to go through sh
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ See [`CHANGELOG.md`](CHANGELOG.md) for details.
```bash
# Can use any of the tags in zeppelin repo that follows semver. E.g. v0.8.2
ZEPPELIN_VERSION="0.10.1"
SPARK_VERSION="3.2.1"
HADOOP_VERSION="3.3.1"
SCALA_VERSION="2.13"
SPARK_VERSION="3.4.1"
HADOOP_VERSION="3.3.4"
SCALA_VERSION="2.12"
JAVA_VERSION="8"

docker build . -t zeppelin \
Expand Down
18 changes: 0 additions & 18 deletions templates/vars.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,6 @@
self_version: "v4"

versions:
- zeppelin: ["0.10.1"]
spark: ["3.1.3"]
java: ["8"]
scala: ["2.12"]
hadoop: ["3.2.0"]

- zeppelin: ["0.10.1"]
spark: ["3.2.2"]
java: ["8"]
scala: ["2.12"]
hadoop: ["3.3.1"]

- zeppelin: ["0.10.1"]
spark: ["3.3.0"]
java: ["8"]
scala: ["2.12"]
hadoop: ["3.3.2"]

- zeppelin: ["0.10.1"]
spark: ["3.4.1"]
java: ["8"]
Expand Down
Loading