This is an automated email from the ASF dual-hosted git repository. manikumar pushed a commit to branch 3.8 in repository https://gitbox.apache.org/repos/asf/kafka.git
commit 15db8233179f0889def4d4f60df199fbde4dd88f Author: KrishVora01 <[email protected]> AuthorDate: Tue Jun 11 21:02:33 2024 +0530 KAFKA-16373: KIP-1028: Modfiying download url for kafka dockerfile (#16281) This PR modifies the download url from https://downloads.apache.org/kafka/ to https://archive.apache.org/dist/kafka/ as the former is not permanent. Reviewers: Manikumar Reddy <[email protected]>, Vedarth Sharma <[email protected]> --- docker/docker_official_image_build_test.py | 2 +- docker/docker_official_images/3.7.0/jvm/Dockerfile | 10 +++++----- docker/prepare_docker_official_image_source.py | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docker/docker_official_image_build_test.py b/docker/docker_official_image_build_test.py index 6ffe25ee0b8..3da68854c23 100644 --- a/docker/docker_official_image_build_test.py +++ b/docker/docker_official_image_build_test.py @@ -76,7 +76,7 @@ if __name__ == '__main__': parser.add_argument("--test", "-t", action="store_true", dest="test_only", default=False, help="Only run the tests, don't build the image") args = parser.parse_args() - kafka_url = f"https://downloads.apache.org/kafka/{args.kafka_version}/kafka_2.13-{args.kafka_version}.tgz"; + kafka_url = f"https://archive.apache.org/dist/kafka/{args.kafka_version}/kafka_2.13-{args.kafka_version}.tgz"; if args.build_only or not (args.build_only or args.test_only): if args.kafka_version: build_docker_official_image(args.image, args.tag, args.kafka_version, args.image_type) diff --git a/docker/docker_official_images/3.7.0/jvm/Dockerfile b/docker/docker_official_images/3.7.0/jvm/Dockerfile index 7aa054a4f7b..905e2f2149b 100755 --- a/docker/docker_official_images/3.7.0/jvm/Dockerfile +++ b/docker/docker_official_images/3.7.0/jvm/Dockerfile @@ -20,8 +20,8 @@ FROM eclipse-temurin:21-jre-alpine AS build-jsa USER root -# Get Kafka from https://downloads.apache.org/kafka, url passed as env var, for version 3.7.0 -ENV kafka_url https://downloads.apache.org/kafka/3.7.0/kafka_2.13-3.7.0.tgz +# Get Kafka from https://archive.apache.org/dist/kafka, url passed as env var, for version 3.7.0 +ENV kafka_url https://archive.apache.org/dist/kafka/3.7.0/kafka_2.13-3.7.0.tgz COPY jsa_launch /etc/kafka/docker/jsa_launch @@ -48,9 +48,9 @@ EXPOSE 9092 USER root -# Get Kafka from https://downloads.apache.org/kafka, url passed as env var, for version 3.7.0 -ENV kafka_url https://downloads.apache.org/kafka/3.7.0/kafka_2.13-3.7.0.tgz -ENV build_date 2024-06-10 +# Get Kafka from https://archive.apache.org/dist/kafka, url passed as env var, for version 3.7.0 +ENV kafka_url https://archive.apache.org/dist/kafka/3.7.0/kafka_2.13-3.7.0.tgz +ENV build_date 2024-06-11 LABEL org.label-schema.name="kafka" \ diff --git a/docker/prepare_docker_official_image_source.py b/docker/prepare_docker_official_image_source.py index 10b4f04d78f..25d57c53e0f 100644 --- a/docker/prepare_docker_official_image_source.py +++ b/docker/prepare_docker_official_image_source.py @@ -46,7 +46,7 @@ def remove_args_and_hardcode_values(file_path, kafka_version, kafka_url): filedata = filedata.replace( "ARG build_date", f"ENV build_date {str(date.today())}") original_comment = re.compile(r"# Get kafka from https://archive.apache.org/dist/kafka and pass the url through build arguments") - updated_comment = f"# Get Kafka from https://downloads.apache.org/kafka, url passed as env var, for version {kafka_version}" + updated_comment = f"# Get Kafka from https://archive.apache.org/dist/kafka, url passed as env var, for version {kafka_version}" filedata = original_comment.sub(updated_comment, filedata) with open(file_path, 'w') as file: file.write(filedata) @@ -59,7 +59,7 @@ if __name__ == '__main__': parser.add_argument("--kafka-version", "-v", dest="kafka_version", help="Kafka version for which the source for docker official image is to be built") args = parser.parse_args() - kafka_url = f"https://downloads.apache.org/kafka/{args.kafka_version}/kafka_2.13-{args.kafka_version}.tgz"; + kafka_url = f"https://archive.apache.org/dist/kafka/{args.kafka_version}/kafka_2.13-{args.kafka_version}.tgz"; current_dir = os.path.dirname(os.path.realpath(__file__)) new_dir = os.path.join( current_dir, f'docker_official_images', args.kafka_version)
