diff --git a/docker/builder/Dockerfile b/docker/builder/Dockerfile index a5c2f041504..bb675411579 100644 --- a/docker/builder/Dockerfile +++ b/docker/builder/Dockerfile @@ -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 && \ diff --git a/docker/builder/download-node.sh b/docker/builder/download-node.sh deleted file mode 100755 index bfdea6b485d..00000000000 --- a/docker/builder/download-node.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -# -# Copyright 2015-2020 The OpenZipkin Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software distributed under the License -# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express -# or implied. See the License for the specific language governing permissions and limitations under -# the License. -# - -# This script downloads the nodejs archive into the Maven local repository so that -# frontend-maven-plugin can work on Alpine/musl. It mostly plays tricks to get rid -# of '-musl' in both the archive name and its contents. -# -# See https://github.com/eirslett/frontend-maven-plugin/pull/853 -set -eux - -# Get the version of node our build wants. -NODE_VERSION=$(mvn -pl zipkin-lens help:evaluate -Dexpression=node.version -q -DforceStdout) - -# Get a local path corresponding to the Maven artifact the frontend-maven-plugin expects -NODE_MAVEN_PATH=~/.m2/repository/com/github/eirslett/node/${NODE_VERSION}/node-${NODE_VERSION}-linux-x64.tar.gz - -if [ ! -f "${NODE_MAVEN_PATH}" ]; then - # Get the URL of the unofficial build of musl - NODE_DOWNLOAD_URL=https://unofficial-builds.nodejs.org/download/release/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64-musl.tar.gz - echo "*** Downloading nodejs into the Maven local repository" - - # Strip '-musl' from the original archive's file paths - mkdir /tmp/$$ && cd /tmp/$$ - wget -qO- ${NODE_DOWNLOAD_URL}| tar --transform 's/-musl//' -xz - - # Create a new archive where Maven would expect it - mkdir -p $(dirname "${NODE_MAVEN_PATH}") - tar -czf ${NODE_MAVEN_PATH} * - cd - - rm -rf /tmp/$$ -fi diff --git a/zipkin-lens/pom.xml b/zipkin-lens/pom.xml index 0e65f03c4aa..d90d7563f3d 100644 --- a/zipkin-lens/pom.xml +++ b/zipkin-lens/pom.xml @@ -32,7 +32,7 @@ 12.18.4 - 1.10.0 + 1.10.2 3.1.0 3.2.0