This is an automated email from the ASF dual-hosted git repository.
snagel pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nutch.git
The following commit(s) were added to refs/heads/master by this push:
new c735ebb NUTCH-2736 Upgrade Dockerfile to be based on recent Ubuntu
LTS version - upgrade to use Ubuntu 18.04 - remove installed packages not
required to build Nutch
new caa9422 Merge pull request #472 from
sebastian-nagel/NUTCH-2736-docker-upgrade-base-image
c735ebb is described below
commit c735ebb7a40dd3e6ab29583ada91a73378922874
Author: Sebastian Nagel <[email protected]>
AuthorDate: Wed Sep 25 10:29:05 2019 +0200
NUTCH-2736 Upgrade Dockerfile to be based on recent Ubuntu LTS version
- upgrade to use Ubuntu 18.04
- remove installed packages not required to build Nutch
---
docker/Dockerfile | 8 ++++----
docker/README.md | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/docker/Dockerfile b/docker/Dockerfile
index c5ba807..3077d1a 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -13,20 +13,20 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM ubuntu:16.04
-MAINTAINER Michael Joyce <[email protected]>
+FROM ubuntu:18.04
+MAINTAINER Apache Nutch Committers <[email protected]>
WORKDIR /root/
# Install dependencies
RUN apt update
-RUN apt install -y ant openssh-server vim telnet git rsync curl
openjdk-8-jdk-headless
+RUN apt install -y ant git openjdk-8-jdk-headless
# Set up JAVA_HOME
RUN echo 'export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64' >> $HOME/.bashrc
-# Checkout and build the nutch trunk
+# Checkout and build the Nutch master branch (1.x)
RUN git clone https://github.com/apache/nutch.git nutch_source && cd
nutch_source && ant runtime
# Convenience symlink to Nutch runtime local
diff --git a/docker/README.md b/docker/README.md
index 36fc852..25d601f 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -14,11 +14,11 @@ Nutch can run on a single machine, but gains a lot of its
strength from running
Current configuration of this image consists of components:
-* Nutch 1.x
+* Nutch 1.x (branch "master")
## Base Image
-* [ubuntu:14.04](https://registry.hub.docker.com/_/ubuntu/)
+* [ubuntu:18.04](https://hub.docker.com/_/ubuntu/)
## Tips
