This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 864f02d1a83 HDDS-14537. Remove legacy dockerfile references (#9692)
864f02d1a83 is described below
commit 864f02d1a838ff4897e4db43f9761d6ac8e1881e
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Sat Jan 31 21:46:08 2026 +0100
HDDS-14537. Remove legacy dockerfile references (#9692)
---
hadoop-hdds/rocksdb-checkpoint-differ/pom.xml | 21 -------
hadoop-ozone/common/pom.xml | 23 --------
hadoop-ozone/dev-support/checks/hadolint.sh | 37 -------------
hadoop-ozone/dev-support/docker/Dockerfile | 57 -------------------
.../dist/dev-support/bin/dist-layout-stitching | 1 -
hadoop-ozone/dist/pom.xml | 64 ----------------------
.../dist/src/main/compose/ozonesecure/README.md | 22 --------
hadoop-ozone/dist/src/main/docker/Dockerfile | 22 --------
hadoop-ozone/pom.xml | 6 --
pom.xml | 6 --
10 files changed, 259 deletions(-)
diff --git a/hadoop-hdds/rocksdb-checkpoint-differ/pom.xml
b/hadoop-hdds/rocksdb-checkpoint-differ/pom.xml
index e991b870299..d37e44eef98 100644
--- a/hadoop-hdds/rocksdb-checkpoint-differ/pom.xml
+++ b/hadoop-hdds/rocksdb-checkpoint-differ/pom.xml
@@ -123,27 +123,6 @@
</plugins>
</build>
<profiles>
- <profile>
- <id>k8s-dev</id>
- <build>
- <plugins>
- <plugin>
- <groupId>io.fabric8</groupId>
- <artifactId>docker-maven-plugin</artifactId>
- <configuration>
- <images>
- <image>
- <name>${user.name}/ozone:${project.version}</name>
- <build>
- <dockerFileDir>${project.basedir}</dockerFileDir>
- </build>
- </image>
- </images>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
<profile>
<id>native-testing</id>
<activation>
diff --git a/hadoop-ozone/common/pom.xml b/hadoop-ozone/common/pom.xml
index 6e673fe3365..f98f248ff21 100644
--- a/hadoop-ozone/common/pom.xml
+++ b/hadoop-ozone/common/pom.xml
@@ -258,27 +258,4 @@
</plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>k8s-dev</id>
- <build>
- <plugins>
- <plugin>
- <groupId>io.fabric8</groupId>
- <artifactId>docker-maven-plugin</artifactId>
- <configuration>
- <images>
- <image>
- <name>${user.name}/ozone:${project.version}</name>
- <build>
- <dockerFileDir>${project.basedir}</dockerFileDir>
- </build>
- </image>
- </images>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/hadoop-ozone/dev-support/checks/hadolint.sh
b/hadoop-ozone/dev-support/checks/hadolint.sh
deleted file mode 100755
index 63291a71194..00000000000
--- 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 6e898a97ed3..00000000000
--- 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 85d347fc6b4..79fb802e38f 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 f3ef154e65c..77dfa804f82 100644
--- a/hadoop-ozone/dist/pom.xml
+++ b/hadoop-ozone/dist/pom.xml
@@ -202,22 +202,6 @@
</resources>
</configuration>
</execution>
- <execution>
- <id>copy-and-filter-dockerfile</id>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <phase>compile</phase>
- <configuration>
- <outputDirectory>${project.build.directory}</outputDirectory>
- <resources>
- <resource>
- <directory>src/main/docker</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- </configuration>
- </execution>
<execution>
<id>copy-k8s</id>
<goals>
@@ -367,54 +351,6 @@
</build>
</profile>
- <profile>
- <id>docker-build</id>
- <build>
- <plugins>
- <plugin>
- <groupId>io.fabric8</groupId>
- <artifactId>docker-maven-plugin</artifactId>
- <configuration>
- <images>
- <image>
- <name>${docker.image}</name>
- <build>
-
<dockerFileDir>${project.build.directory}/ozone-${project.version}</dockerFileDir>
- </build>
- </image>
- </images>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>build</goal>
- </goals>
- <phase>package</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>docker-push</id>
- <build>
- <plugins>
- <plugin>
- <groupId>io.fabric8</groupId>
- <artifactId>docker-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>push</goal>
- </goals>
- <phase>package</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
<profile>
<id>dist</id>
<build>
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 0ce9a0a8926..00000000000
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure/README.md
+++ /dev/null
@@ -1,22 +0,0 @@
-<!---
- 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. See accompanying LICENSE file.
--->
-# 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 4dc81f2390e..00000000000
--- 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 ac21cd77325..807e907bcf4 100644
--- a/hadoop-ozone/pom.xml
+++ b/hadoop-ozone/pom.xml
@@ -103,12 +103,6 @@
</build>
<profiles>
- <profile>
- <id>docker-build</id>
- <properties>
- <docker.image>${user.name}/ozone:${project.version}</docker.image>
- </properties>
- </profile>
<profile>
<id>build-with-ozonefs</id>
<activation>
diff --git a/pom.xml b/pom.xml
index e4ab7f432c8..b2d0326622c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,7 +82,6 @@
<distMgmtStagingId>apache.staging.https</distMgmtStagingId>
<distMgmtStagingName>Apache Release Distribution
Repository</distMgmtStagingName>
<distMgmtStagingUrl>https://repository.apache.org/service/local/staging/deploy/maven2</distMgmtStagingUrl>
- <docker-maven-plugin.version>0.45.1</docker-maven-plugin.version>
<download-maven-plugin.version>1.9.0</download-maven-plugin.version>
<dropwizard-metrics.version>3.2.6</dropwizard-metrics.version>
<enforced.java.version>[${javac.version},)</enforced.java.version>
@@ -2072,11 +2071,6 @@
<artifactId>jacoco-maven-plugin</artifactId>
<version>${jacoco.version}</version>
</plugin>
- <plugin>
- <groupId>io.fabric8</groupId>
- <artifactId>docker-maven-plugin</artifactId>
- <version>${docker-maven-plugin.version}</version>
- </plugin>
<plugin>
<groupId>com.googlecode.maven-download-plugin</groupId>
<artifactId>download-maven-plugin</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
