This is an automated email from the ASF dual-hosted git repository.
aw pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/yetus.git
The following commit(s) were added to refs/heads/main by this push:
new 4403d1d9 YETUS-1211. Change Dockerfiles default repos to be ghcr.io
(#306)
4403d1d9 is described below
commit 4403d1d99423249f486272d5f42e208c6efa8160
Author: Allen Wittenauer <[email protected]>
AuthorDate: Fri May 26 20:39:42 2023 -0700
YETUS-1211. Change Dockerfiles default repos to be ghcr.io (#306)
---
.github/workflows/yetus.yml | 2 +-
.semaphore/semaphore-build.sh | 2 +-
Dockerfile | 2 +-
Jenkinsfile | 2 +-
README.md | 8 +++----
asf-site-src/Dockerfile | 2 +-
asf-site-src/source/yetus-docker-image.html.md | 2 +-
start-build-env.sh | 30 ++++++++++----------------
8 files changed, 21 insertions(+), 29 deletions(-)
diff --git a/.github/workflows/yetus.yml b/.github/workflows/yetus.yml
index bf19ad7c..42c3deb8 100644
--- a/.github/workflows/yetus.yml
+++ b/.github/workflows/yetus.yml
@@ -47,7 +47,7 @@ jobs:
--bugcomments=console,briefreport,github,htmlout,junit
--console-report-file="${GITHUB_WORKSPACE}/out/console.txt"
--docker
- --docker-cache-from=apache/yetus-base:main
+ --docker-cache-from=ghcr.io/apache/yetus-base:main
--github-token="${{ secrets.GITHUB_TOKEN }}"
--html-report-file="${GITHUB_WORKSPACE}/out/report.html"
--java-home=/usr/lib/jvm/java-11-openjdk-amd64
diff --git a/.semaphore/semaphore-build.sh b/.semaphore/semaphore-build.sh
index a18509f5..1bf78544 100755
--- a/.semaphore/semaphore-build.sh
+++ b/.semaphore/semaphore-build.sh
@@ -26,4 +26,4 @@ PRECOMMITDIR=precommit/src/main/shell
--junit-report-xml=/tmp/yetus-out/junit-results.xml \
--docker \
--dockerfile="${PRECOMMITDIR}/test-patch-docker/Dockerfile" \
- --docker-cache-from=ghcr.io/apache/yetus-base:main,ubuntu:focal
+ --docker-cache-from=ghcr.io/apache/yetus-base:main,ubuntu:jammy
diff --git a/Dockerfile b/Dockerfile
index 573571a2..091309b0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,7 +14,7 @@
# limitations under the License.
ARG DOCKER_TAG=main
-ARG DOCKER_REPO=apache/yetus
+ARG DOCKER_REPO=ghcr.io/apache/yetus
FROM ${DOCKER_REPO}-base:${DOCKER_TAG}
LABEL org.apache.yetus=""
diff --git a/Jenkinsfile b/Jenkinsfile
index 0ddbca26..5d545f14 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -132,7 +132,7 @@ pipeline {
# run in docker mode and specifically point to our
# Dockerfile since we don't want to use the auto-pulled
version.
if [[ "${USE_DOCKER_FLAG}" == true ]]; then
- docker pull ubuntu:focal
+ docker pull ubuntu:jammy
YETUS_ARGS+=("--docker")
YETUS_ARGS+=("--dockerfile=${YETUS_DOCKERFILE}")
YETUS_ARGS+=("--docker-cache-from=ghcr.io/apache/yetus-base:main")
diff --git a/README.md b/README.md
index 1c318191..2c5a466f 100644
--- a/README.md
+++ b/README.md
@@ -74,12 +74,12 @@ After executing one or more of the Apache Maven commands,
artifacts will be in `
## Container Quickstart
-The project makes available two convenience container images on
<https://hub.docker.com> for both tagged releases and for the main branch. It
is highly recommended that casual users use a tagged release so as to not be
surprised by incompatible changes that are still rolling through the main
branch.
+The project makes available two convenience container images on
<https://ghcr.io> for both tagged releases and for the main branch. It is
highly recommended that casual users use a tagged release so as to not be
surprised by incompatible changes that are still rolling through the main
branch.
-### apache/yetus-base
+### ghcr.io/apache/yetus-base
This image contains all of the tools that Apache Yetus supports. It is
intended to be used when the Apache Yetus binaries are running outside of the
container to speed up building the actual testing container.
-### apache/yetus
+### ghcr.io/apache/yetus
-This image contains all of apache/yetus-base plus a built and installed
version of Apache Yetus. The binaries are in `/usr/bin` and therefore part of
the default path. This image is ideal for CI systems that take a container
image as the operating environment or for interactive use.
+This image contains all of ghcr.io/apache/yetus-base plus a built and
installed version of Apache Yetus. The binaries are in `/usr/bin` and
therefore part of the default path. This image is ideal for CI systems that
take a container image as the operating environment or for interactive use.
diff --git a/asf-site-src/Dockerfile b/asf-site-src/Dockerfile
index 7b7ea467..cbb18345 100644
--- a/asf-site-src/Dockerfile
+++ b/asf-site-src/Dockerfile
@@ -15,7 +15,7 @@
# limitations under the License.
ARG DOCKER_TAG=main
-ARG DOCKER_REPO=apache/yetus
+ARG DOCKER_REPO=ghcr.io/apache/yetus
FROM ${DOCKER_REPO}-build:${DOCKER_TAG}
WORKDIR /root
diff --git a/asf-site-src/source/yetus-docker-image.html.md
b/asf-site-src/source/yetus-docker-image.html.md
index 31f30bb5..d3638546 100644
--- a/asf-site-src/source/yetus-docker-image.html.md
+++ b/asf-site-src/source/yetus-docker-image.html.md
@@ -35,7 +35,7 @@ the GitHub Container Registry:
* ghcr.io/apache/yetus
- This image is the same as apache/yetus-base but includes a pre-built version
of Apache Yetus as part of the base OS image. In other words, qbt,
releasedocmaker, shelldocs, test-patch, etc., are in /usr/bin and available in
the default path. It is generated from the Dockerfile located in the root of
the source and is built with the options provided in the hooks directory.
+ This image is the same as ghcr.io/aapache/yetus-base but includes a
pre-built version of Apache Yetus as part of the base OS image. In other words,
qbt, releasedocmaker, shelldocs, test-patch, etc., are in /usr/bin and
available in the default path. It is generated from the Dockerfile located in
the root of the source and is built with the options provided in the hooks
directory.
Both images should be suitable to be used as a building block or even directly
if your build environment needs no other dependencies. These images are
especially useful for various CI systems that require a Docker image to be used.
diff --git a/start-build-env.sh b/start-build-env.sh
index daaccd9c..ab06503c 100755
--- a/start-build-env.sh
+++ b/start-build-env.sh
@@ -20,26 +20,19 @@
make_cache_list() {
gotit="false"
cache_array=()
- for imagelocation in "${YETUS_DOCKER_REPO}" "${ASF_DOCKER_REPO}"; do
- if [[ "${imagelocation}" == "apache/yetus" ]]; then
- # skip Apache docker hub since we will pull from
- # github later
- continue
- fi
- for branch in "${BRANCH}" "main"; do
- for type in "-base" ""; do
- image="${imagelocation}${type}:${branch}"
- if docker pull "${image}"; then
- cache_array+=("${image}")
- gotit="true"
- break
- fi
- done
- if [[ "${gotit}" == "true" ]]; then
- gotit="false"
+ for branch in "${BRANCH}" "main"; do
+ for type in "-base" ""; do
+ image="${YETUS_DOCKER_REPO}${type}:${branch}"
+ if docker pull "${image}"; then
+ cache_array+=("${image}")
+ gotit="true"
break
fi
done
+ if [[ "${gotit}" == "true" ]]; then
+ gotit="false"
+ break
+ fi
done
printf -v thelist "%s," "${cache_array[@]}"
CACHE_LIST=${thelist%,}
@@ -48,8 +41,7 @@ make_cache_list() {
set -e # exit on error
ROOTDIR=$(cd -P -- "$(dirname -- "${BASH_SOURCE-$0}")" >/dev/null && pwd -P)
-ASF_DOCKER_REPO="ghcr.io/apache/yetus"
-YETUS_DOCKER_REPO=${YETUS_DOCKER_REPO:-apache/yetus}
+YETUS_DOCKER_REPO=${YETUS_DOCKER_REPO:-ghcr.io/apache/yetus}
CACHE_LIST=""
# shellcheck disable=SC2034
