This is an automated email from the ASF dual-hosted git repository. mbalassi pushed a commit to branch release-1.15.2.4-acs in repository https://gitbox.apache.org/repos/asf/flink.git
commit 4986164c99cf675f10d34617eb7dcab29f3b013a Author: Gabor Somogyi <[email protected]> AuthorDate: Tue Sep 13 12:13:46 2022 +0200 [apple] switch to downstream hadoop version 3.3.3.2 --- apple/docker/Dockerfile | 24 ++++++++++++++---------- apple/docker/README.md | 2 +- rio.yml | 2 +- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/apple/docker/Dockerfile b/apple/docker/Dockerfile index 5ccb1a6e327..9e8f1d672d5 100644 --- a/apple/docker/Dockerfile +++ b/apple/docker/Dockerfile @@ -52,32 +52,36 @@ CMD ["help"] FROM base as hadoop +ENV HADOOP_VERSION 3.3.3 +ENV HADOOP_APPLE_VERSION 2 +ENV HADOOP_TGZ_DIRECTORY hadoop-$HADOOP_VERSION.$HADOOP_APPLE_VERSION-apple +ENV HADOOP_TGZ_FILE $HADOOP_TGZ_DIRECTORY.tar.gz ENV HADOOP_USER hdfs -ENV HADOOP_PREFIX /usr/local/hadoop-3.3.1 -ENV HADOOP_COMMON_HOME /usr/local/hadoop-3.3.1 -ENV HADOOP_HDFS_HOME /usr/local/hadoop-3.3.1 -ENV HADOOP_CONF_DIR /usr/local/hadoop-3.3.1/etc/hadoop +ENV HADOOP_PREFIX /usr/local/hadoop-$HADOOP_VERSION +ENV HADOOP_COMMON_HOME /usr/local/hadoop-$HADOOP_VERSION +ENV HADOOP_HDFS_HOME /usr/local/hadoop-$HADOOP_VERSION +ENV HADOOP_CONF_DIR /usr/local/hadoop-$HADOOP_VERSION/etc/hadoop # Download hadoop -COPY hadoop-3.3.1.tar.gz /usr/local/ +COPY $HADOOP_TGZ_FILE /usr/local/ RUN set -ex; \ cd /usr/local/; \ - tar -xvf hadoop-3.3.1.tar.gz; \ - rm hadoop-3.3.1.tar.gz + tar -xvf $HADOOP_TGZ_FILE; \ + rm $HADOOP_TGZ_FILE -RUN ln -s /usr/local/hadoop-3.1.1 /usr/local/hadoop \ +RUN ln -s /usr/local/$HADOOP_TGZ_DIRECTORY /usr/local/hadoop \ && groupadd -r hadoop \ && groupadd -r $HADOOP_USER && useradd -r -g $HADOOP_USER -G hadoop $HADOOP_USER # RUN mkdir -p $HADOOP_CONF_DIR # Setup permissions and ownership -RUN chown -R $HADOOP_USER:hadoop /usr/local/hadoop-3.3.1 # && chmod -R 775 $HADOOP_CONF_DIR +RUN chown -R $HADOOP_USER:hadoop /usr/local/$HADOOP_TGZ_DIRECTORY # && chmod -R 775 $HADOOP_CONF_DIR # Set up hadoop user and bin path ENV HADOOP_USER_NAME $HADOOP_USER ENV PATH="${HADOOP_PREFIX}/bin:${PATH}" -ENV HADOOP_CLASSPATH="/usr/local/hadoop-3.3.1/etc/hadoop:/usr/local/hadoop-3.3.1/share/hadoop/common/lib/*:/usr/local/hadoop-3.3.1/share/hadoop/common/*:/usr/local/hadoop-3.3.1/share/hadoop/hdfs:/usr/local/hadoop-3.3.1/share/hadoop/hdfs/lib/*:/usr/local/hadoop-3.3.1/share/hadoop/hdfs/*:/usr/local/hadoop-3.3.1/share/hadoop/mapreduce/*:/usr/local/hadoop-3.3.1/share/hadoop/yarn:/usr/local/hadoop-3.3.1/share/hadoop/yarn/lib/*:/usr/local/hadoop-3.3.1/share/hadoop/yarn/*" +ENV HADOOP_CLASSPATH="/usr/local/hadoop/etc/hadoop:/usr/local/hadoop/share/hadoop/common/lib/*:/usr/local/hadoop/share/hadoop/common/*:/usr/local/hadoop/share/hadoop/hdfs:/usr/local/hadoop/share/hadoop/hdfs/lib/*:/usr/local/hadoop/share/hadoop/hdfs/*:/usr/local/hadoop/share/hadoop/mapreduce/*:/usr/local/hadoop/share/hadoop/yarn:/usr/local/hadoop/share/hadoop/yarn/lib/*:/usr/local/hadoop/share/hadoop/yarn/*" # Configure container COPY docker-entrypoint.sh / diff --git a/apple/docker/README.md b/apple/docker/README.md index 60cd1dacd59..4637c6c437a 100644 --- a/apple/docker/README.md +++ b/apple/docker/README.md @@ -17,7 +17,7 @@ popd For the Hadoop image download the Hadoop distro: ```bash -wget https://archive.apache.org/dist/hadoop/common/hadoop-3.3.1/hadoop-3.3.1.tar.gz +wget https://artifacts.apple.com/artifactory/oss-patched-binaries-local/org/apache/hadoop/3.3.3.2-apple/hadoop-3.3.3.2-apple.tar.gz ``` ## Build diff --git a/rio.yml b/rio.yml index 58a8f138461..bf982e6113d 100644 --- a/rio.yml +++ b/rio.yml @@ -20,7 +20,7 @@ pipelines: - ci stage-lib --exclude maven-metadata.xml --exclude *.md5 --exclude *.sha1 --many-many-artifacts ./.staged-artifacts/** # Prepare for docker image build - pushd flink-dist/target/flink-*-bin/; tar czf flink.tgz flink-*; cp flink.tgz /workspace/apple/docker/; popd - - pushd /workspace/apple/docker; wget https://archive.apache.org/dist/hadoop/common/hadoop-3.3.1/hadoop-3.3.1.tar.gz; popd + - pushd /workspace/apple/docker; wget https://artifacts.apple.com/artifactory/oss-patched-binaries-local/org/apache/hadoop/3.3.3.2-apple/hadoop-3.3.3.2-apple.tar.gz; popd package: # enable for release (non -SNAPSHOT) builds # release: true
