From c42441a1ec4338886130c8e1cb64852e218c83fc Mon Sep 17 00:00:00 2001
From: Masatake Iwasaki <iwasakims@apache.org>
Date: Wed, 7 Jul 2021 11:07:10 +0900
Subject: [PATCH] HADOOP-17775. Remove JavaScript package from Docker
 environment. (#3137)

Signed-off-by: Akira Ajisaka <aajisaka@apache.org>
---
 dev-support/docker/Dockerfile_centos_7        |  1 -
 dev-support/docker/Dockerfile_centos_8        |  2 -
 .../pkg-resolver/install-common-pkgs.sh       |  6 ---
 .../docker/pkg-resolver/install-nodejs.sh     | 54 -------------------
 dev-support/docker/pkg-resolver/packages.json | 20 +------
 5 files changed, 1 insertion(+), 82 deletions(-)
 delete mode 100644 dev-support/docker/pkg-resolver/install-nodejs.sh

diff --git a/dev-support/docker/Dockerfile_centos_7 b/dev-support/docker/Dockerfile_centos_7
index c74230e758..b645d81c29 100644
--- a/dev-support/docker/Dockerfile_centos_7
+++ b/dev-support/docker/Dockerfile_centos_7
@@ -76,5 +76,4 @@ RUN pkg-resolver/install-yasm.sh centos:7
 RUN pkg-resolver/install-protobuf.sh centos:7
 RUN pkg-resolver/install-boost.sh centos:7
 RUN pkg-resolver/install-spotbugs.sh centos:7
-RUN pkg-resolver/install-nodejs.sh centos:7
 RUN pkg-resolver/install-common-pkgs.sh
diff --git a/dev-support/docker/Dockerfile_centos_8 b/dev-support/docker/Dockerfile_centos_8
index 20fd133d5c..7b82c4997d 100644
--- a/dev-support/docker/Dockerfile_centos_8
+++ b/dev-support/docker/Dockerfile_centos_8
@@ -52,8 +52,6 @@ RUN dnf install -y \
     bouncycastle \
     gcc-toolset-9-gcc \
     gcc-toolset-9-gcc-c++ \
-    nodejs \
-    npm \
     libpmem-devel
 
 # Set GCC 9 as the default C/C++ compiler
diff --git a/dev-support/docker/pkg-resolver/install-common-pkgs.sh b/dev-support/docker/pkg-resolver/install-common-pkgs.sh
index d6756eea73..f91617db6c 100644
--- a/dev-support/docker/pkg-resolver/install-common-pkgs.sh
+++ b/dev-support/docker/pkg-resolver/install-common-pkgs.sh
@@ -20,9 +20,3 @@
 # Install pylint and python-dateutil
 ######
 pip3 install pylint==2.6.0 python-dateutil==2.8.1
-
-######
-# Install bower
-######
-# hadolint ignore=DL3008
-npm install -g bower@1.8.8
diff --git a/dev-support/docker/pkg-resolver/install-nodejs.sh b/dev-support/docker/pkg-resolver/install-nodejs.sh
deleted file mode 100644
index 5ba1c22808..0000000000
--- a/dev-support/docker/pkg-resolver/install-nodejs.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/usr/bin/env bash
-
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you 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.
-
-if [ $# -lt 1 ]; then
-  echo "ERROR: Need at least 1 argument, $# were provided"
-  exit 1
-fi
-
-pkg-resolver/check_platform.py "$1"
-if [ $? -eq 1 ]; then
-  echo "ERROR: Unsupported platform $1"
-  exit 1
-fi
-
-default_version="14.16.1"
-version_to_install=$default_version
-if [ -n "$2" ]; then
-  version_to_install="$2"
-fi
-
-if [ "$version_to_install" != "14.16.1" ]; then
-  echo "WARN: Don't know how to install version $version_to_install, installing the default version $default_version instead"
-  version_to_install=$default_version
-fi
-
-if [ "$version_to_install" == "14.16.1" ]; then
-  # hadolint ignore=DL3003
-  mkdir -p /tmp/node &&
-    curl -L -s -S https://nodejs.org/dist/v14.16.1/node-v14.16.1.tar.gz -o /tmp/node-v14.16.1.tar.gz &&
-    tar xzf /tmp/node-v14.16.1.tar.gz --strip-components 1 -C /tmp/node &&
-    cd /tmp/node || exit &&
-    ./configure &&
-    make "-j$(nproc)" &&
-    make install &&
-    cd /root || exit
-else
-  echo "ERROR: Don't know how to install version $version_to_install"
-  exit 1
-fi
diff --git a/dev-support/docker/pkg-resolver/packages.json b/dev-support/docker/pkg-resolver/packages.json
index cb4b7914d5..e794b4cfdb 100644
--- a/dev-support/docker/pkg-resolver/packages.json
+++ b/dev-support/docker/pkg-resolver/packages.json
@@ -245,24 +245,6 @@
     "ubuntu:focal": "maven",
     "ubuntu:focal::arch64": "maven"
   },
-  "javascript": {
-    "debian:10": [
-      "nodejs",
-      "node-yarn",
-      "npm"
-    ],
-    "ubuntu:focal": [
-      "nodejs",
-      "node-yarn",
-      "npm"
-    ],
-    "ubuntu:focal::arch64": [
-      "nodejs",
-      "node-yarn",
-      "npm",
-      "phantomjs"
-    ]
-  },
   "java": {
     "debian:10": "openjdk-11-jdk",
     "ubuntu:focal": [
@@ -363,4 +345,4 @@
     "ubuntu:focal": "yasm",
     "ubuntu:focal::arch64": "yasm"
   }
-}
\ No newline at end of file
+}