diff --git a/hadoop-hdds/rocksdb-checkpoint-differ/pom.xml b/hadoop-hdds/rocksdb-checkpoint-differ/pom.xml index e991b8702990..d37e44eef982 100644 --- a/hadoop-hdds/rocksdb-checkpoint-differ/pom.xml +++ b/hadoop-hdds/rocksdb-checkpoint-differ/pom.xml @@ -123,27 +123,6 @@ - - k8s-dev - - - - io.fabric8 - docker-maven-plugin - - - - ${user.name}/ozone:${project.version} - - ${project.basedir} - - - - - - - - native-testing diff --git a/hadoop-ozone/common/pom.xml b/hadoop-ozone/common/pom.xml index 6e673fe33652..f98f248ff219 100644 --- a/hadoop-ozone/common/pom.xml +++ b/hadoop-ozone/common/pom.xml @@ -258,27 +258,4 @@ - - - k8s-dev - - - - io.fabric8 - docker-maven-plugin - - - - ${user.name}/ozone:${project.version} - - ${project.basedir} - - - - - - - - - diff --git a/hadoop-ozone/dev-support/checks/hadolint.sh b/hadoop-ozone/dev-support/checks/hadolint.sh deleted file mode 100755 index 63291a711942..000000000000 --- a/hadoop-ozone/dev-support/checks/hadolint.sh +++ /dev/null @@ -1,37 +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. -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -cd "$DIR/../../.." || exit 1 -REPO_DIR="$DIR/../../.." - -REPORT_DIR=${OUTPUT_DIR:-"$DIR/../../../target/hadolint"} -mkdir -p "$REPORT_DIR" -REPORT_FILE="$REPORT_DIR/summary.txt" -echo -n > "$REPORT_FILE" - -for Dockerfile in $(find hadoop-ozone hadoop-hdds -name Dockerfile | sort); do - hadolint $Dockerfile | tee -a "$REPORT_FILE" -done - -wc -l "$REPORT_FILE" | awk '{print $1}'> "$REPORT_DIR/failures" - -if [ -s "${REPORT_FILE}" ] -then - echo "" | tee -a "$REPORT_FILE" - echo "" | tee -a "$REPORT_FILE" - echo "Hadolint errors were found. Exit code: 1." | tee -a "$REPORT_FILE" - exit 1 -fi diff --git a/hadoop-ozone/dev-support/docker/Dockerfile b/hadoop-ozone/dev-support/docker/Dockerfile deleted file mode 100644 index 6e898a97ed3f..000000000000 --- a/hadoop-ozone/dev-support/docker/Dockerfile +++ /dev/null @@ -1,57 +0,0 @@ -# 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. -FROM alpine -RUN apk add --update --no-cache bash alpine-sdk maven grep openjdk8 py-pip rsync procps autoconf automake libtool findutils python3-dev libffi-dev openssl-dev gcc libc-dev rust cargo make - -#Install real glibc -RUN apk --no-cache add ca-certificates wget && \ - wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \ - wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.33-r0/glibc-2.33-r0.apk && \ - apk add glibc-2.33-r0.apk - -#Spotbugs install -RUN mkdir -p /opt && \ - curl -sL https://repo.maven.apache.org/maven2/com/github/spotbugs/spotbugs/3.1.12/spotbugs-3.1.12.tgz | tar -xz && \ - mv spotbugs-* /opt/spotbugs - -#Install apache-ant -RUN mkdir -p /opt && \ - curl -sL 'https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=/ant/binaries/apache-ant-1.10.11-bin.tar.gz' | tar -xz && \ - mv apache-ant* /opt/ant - -#Install docker-compose -RUN pip install docker-compose - -#Install pytest==2.8.7 -RUN pip install pytest==2.8.7 - -ENV PATH=$PATH:/opt/spotbugs/bin - -RUN addgroup -g 1000 default && \ - for i in $(seq 1 2000); do adduser jenkins$i -u $i -G default -h /tmp/ -H -D; done - -#This is a very huge local maven cache. Usually the mvn repository is not safe to be -#shared between builds as concurrent installls are not handled very well -#A simple workaround is to provide all the required 3rd party lib in the docker image -#It will be cached by docker, and any additional dependency can be downloaded, artifacts -#can be installed -USER jenkins1000 -RUN cd /tmp && \ - git clone --depth=1 https://gitbox.apache.org/repos/asf/ozone.git -b master && \ - cd /tmp/ozone && \ - mvn package dependency:go-offline -DskipTests -pl :ozone-dist -am && \ - rm -rf /tmp/.m2/repository/org/apache/ozone/hdds* && \ - rm -rf /tmp/.m2/repository/org/apache/ozone/ozone* && \ - find /tmp/.m2/repository -exec chmod o+wx {} \; diff --git a/hadoop-ozone/dist/dev-support/bin/dist-layout-stitching b/hadoop-ozone/dist/dev-support/bin/dist-layout-stitching index 85d347fc6b41..79fb802e38f9 100755 --- a/hadoop-ozone/dist/dev-support/bin/dist-layout-stitching +++ b/hadoop-ozone/dist/dev-support/bin/dist-layout-stitching @@ -126,7 +126,6 @@ run cp -r "${ROOT}/dev-support/byteman" "share/ozone/" run cp -p -R "${ROOT}/hadoop-ozone/dist/target/compose" . run cp -p -r "${ROOT}/hadoop-ozone/dist/target/smoketest" . run cp -p -r "${ROOT}/hadoop-ozone/dist/target/k8s" kubernetes -run cp -p -r "${ROOT}/hadoop-ozone/dist/target/Dockerfile" . run mkdir compose/_keytabs diff --git a/hadoop-ozone/dist/pom.xml b/hadoop-ozone/dist/pom.xml index f3ef154e65c4..77dfa804f821 100644 --- a/hadoop-ozone/dist/pom.xml +++ b/hadoop-ozone/dist/pom.xml @@ -202,22 +202,6 @@ - - copy-and-filter-dockerfile - - copy-resources - - compile - - ${project.build.directory} - - - src/main/docker - true - - - - copy-k8s @@ -367,54 +351,6 @@ - - docker-build - - - - io.fabric8 - docker-maven-plugin - - - - ${docker.image} - - ${project.build.directory}/ozone-${project.version} - - - - - - - - build - - package - - - - - - - - docker-push - - - - io.fabric8 - docker-maven-plugin - - - - push - - package - - - - - - dist diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure/README.md b/hadoop-ozone/dist/src/main/compose/ozonesecure/README.md deleted file mode 100644 index 0ce9a0a89262..000000000000 --- a/hadoop-ozone/dist/src/main/compose/ozonesecure/README.md +++ /dev/null @@ -1,22 +0,0 @@ - -# Experimental UNSECURE krb5 Kerberos container. - -Only for development. Not for production. - -#### Dockerfile for KDC: -* ./docker-image/docker-krb5/Dockerfile-krb5 - -#### Dockerfile for SCM,OM and DataNode: -* ./docker-image/runner/Dockerfile \ No newline at end of file diff --git a/hadoop-ozone/dist/src/main/docker/Dockerfile b/hadoop-ozone/dist/src/main/docker/Dockerfile deleted file mode 100644 index 4dc81f2390ec..000000000000 --- a/hadoop-ozone/dist/src/main/docker/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -# 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. - -FROM apache/ozone-runner:@docker.ozone-runner.version@ - - -ADD --chown=hadoop . /opt/hadoop - -WORKDIR /opt/hadoop diff --git a/hadoop-ozone/pom.xml b/hadoop-ozone/pom.xml index ac21cd77325d..807e907bcf4c 100644 --- a/hadoop-ozone/pom.xml +++ b/hadoop-ozone/pom.xml @@ -103,12 +103,6 @@ - - docker-build - - ${user.name}/ozone:${project.version} - - build-with-ozonefs diff --git a/pom.xml b/pom.xml index e4ab7f432c89..b2d0326622c3 100644 --- a/pom.xml +++ b/pom.xml @@ -82,7 +82,6 @@ apache.staging.https Apache Release Distribution Repository https://repository.apache.org/service/local/staging/deploy/maven2 - 0.45.1 1.9.0 3.2.6 [${javac.version},) @@ -2072,11 +2071,6 @@ jacoco-maven-plugin ${jacoco.version} - - io.fabric8 - docker-maven-plugin - ${docker-maven-plugin.version} - com.googlecode.maven-download-plugin download-maven-plugin