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

Removes Alpine workaround for maven-frontend-plugin #3226

Merged
merged 1 commit into from
Oct 5, 2020
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
5 changes: 0 additions & 5 deletions docker/builder/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,6 @@ WORKDIR /code
# Copy Maven source tree into the Docker context
COPY . .

# Make sure zipkin-lens can build on Alpine by eagerly caching an unofficial build.
# Temporarily workaround https://github.com/eirslett/frontend-maven-plugin/pull/853
COPY docker/builder/download-node.sh .
RUN ./download-node.sh

# Use the same command as we suggest in zipkin-server/README.md to hydrate the Maven and NPM cache
# * Uses mvn not ./mvnw to reduce layer size: we control the Maven version independently in Docker
RUN mvn -q --batch-mode -DskipTests -Dlicense.skip=true --also-make -pl zipkin-server package && \
Expand Down
43 changes: 0 additions & 43 deletions docker/builder/download-node.sh

This file was deleted.

2 changes: 1 addition & 1 deletion zipkin-lens/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<!-- Update occasionally based on LTS. Upon update, push a new zipkin-builder image
per /docker/builder/README.md -->
<node.version>12.18.4</node.version>
<frontend-maven-plugin.version>1.10.0</frontend-maven-plugin.version>
<frontend-maven-plugin.version>1.10.2</frontend-maven-plugin.version>
<maven-clean-plugin.version>3.1.0</maven-clean-plugin.version>
<maven-resources-plugin.version>3.2.0</maven-resources-plugin.version>
</properties>
Expand Down