Skip to content

Commit 3a72fad

Browse files
Akos-Kreutzbrianchandotcom
Akos-Kreutz
authored and
brianchandotcom
committed
DOCKER-175 Allow configuring the docker hub repo
1 parent 58aa84f commit 3a72fad

10 files changed

+41
-36
lines changed

Diff for: ‎build_all_images.sh

+14-9
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ function build_base_image {
1717
echo "Building Docker image Base."
1818
echo ""
1919

20-
LIFERAY_DOCKER_IMAGE_PLATFORMS="${LIFERAY_DOCKER_IMAGE_PLATFORMS}" time ./build_base_image.sh "${BUILD_ALL_IMAGES_PUSH}" | tee -a "${LOGS_DIR}"/base.log
20+
LIFERAY_DOCKER_IMAGE_PLATFORMS="${LIFERAY_DOCKER_IMAGE_PLATFORMS}" LIFERAY_DOCKER_REPOSITORY="${LIFERAY_DOCKER_REPOSITORY}" time ./build_base_image.sh "${BUILD_ALL_IMAGES_PUSH}" | tee -a "${LOGS_DIR}"/base.log
2121

2222
if [ "${PIPESTATUS[0]}" -gt 0 ]
2323
then
@@ -56,7 +56,7 @@ function build_bundle_image {
5656
echo "Building Docker image ${build_id} based on ${bundle_url}."
5757
echo ""
5858

59-
LIFERAY_DOCKER_FIX_PACK_URL=${fix_pack_url} LIFERAY_DOCKER_IMAGE_PLATFORMS="${LIFERAY_DOCKER_IMAGE_PLATFORMS}" LIFERAY_DOCKER_LATEST=${latest} LIFERAY_DOCKER_RELEASE_FILE_URL=${bundle_url} LIFERAY_DOCKER_RELEASE_VERSION=${version} LIFERAY_DOCKER_TEST_HOTFIX_URL=${test_hotfix_url} LIFERAY_DOCKER_TEST_INSTALLED_PATCHES=${test_installed_patch} time ./build_bundle_image.sh "${BUILD_ALL_IMAGES_PUSH}" 2>&1 | tee "${LOGS_DIR}/${build_id}.log"
59+
LIFERAY_DOCKER_FIX_PACK_URL=${fix_pack_url} LIFERAY_DOCKER_IMAGE_PLATFORMS="${LIFERAY_DOCKER_IMAGE_PLATFORMS}" LIFERAY_DOCKER_LATEST=${latest} LIFERAY_DOCKER_RELEASE_FILE_URL=${bundle_url} LIFERAY_DOCKER_RELEASE_VERSION=${version} LIFERAY_DOCKER_REPOSITORY="${LIFERAY_DOCKER_REPOSITORY}" LIFERAY_DOCKER_TEST_HOTFIX_URL=${test_hotfix_url} LIFERAY_DOCKER_TEST_INSTALLED_PATCHES=${test_installed_patch} time ./build_bundle_image.sh "${BUILD_ALL_IMAGES_PUSH}" 2>&1 | tee "${LOGS_DIR}/${build_id}.log"
6060

6161
local build_bundle_image_exit_code=${PIPESTATUS[0]}
6262

@@ -141,7 +141,7 @@ function build_caddy_image {
141141
echo "Building Docker image Caddy resources."
142142
echo ""
143143

144-
LIFERAY_DOCKER_IMAGE_PLATFORMS="${LIFERAY_DOCKER_IMAGE_PLATFORMS}" time ./build_caddy_image.sh "${BUILD_ALL_IMAGES_PUSH}" | tee -a "${LOGS_DIR}"/caddy.log
144+
LIFERAY_DOCKER_IMAGE_PLATFORMS="${LIFERAY_DOCKER_IMAGE_PLATFORMS}" LIFERAY_DOCKER_REPOSITORY="${LIFERAY_DOCKER_REPOSITORY}" time ./build_caddy_image.sh "${BUILD_ALL_IMAGES_PUSH}" | tee -a "${LOGS_DIR}"/caddy.log
145145

146146
if [ "${PIPESTATUS[0]}" -gt 0 ]
147147
then
@@ -166,7 +166,7 @@ function build_dynamic_rendering_image {
166166
echo "Building Docker image Dynamic Rendering."
167167
echo ""
168168

169-
LIFERAY_DOCKER_IMAGE_PLATFORMS="${LIFERAY_DOCKER_IMAGE_PLATFORMS}" time ./build_dynamic_rendering_image.sh "${BUILD_ALL_IMAGES_PUSH}" | tee -a "${LOGS_DIR}"/dynamic_rendering.log
169+
LIFERAY_DOCKER_IMAGE_PLATFORMS="${LIFERAY_DOCKER_IMAGE_PLATFORMS}" LIFERAY_DOCKER_REPOSITORY="${LIFERAY_DOCKER_REPOSITORY}" time ./build_dynamic_rendering_image.sh "${BUILD_ALL_IMAGES_PUSH}" | tee -a "${LOGS_DIR}"/dynamic_rendering.log
170170

171171
if [ "${PIPESTATUS[0]}" -gt 0 ]
172172
then
@@ -194,7 +194,7 @@ function build_jdk11_image {
194194
echo "Building Docker image JDK 11."
195195
echo ""
196196

197-
LIFERAY_DOCKER_IMAGE_PLATFORMS="${LIFERAY_DOCKER_IMAGE_PLATFORMS}" LIFERAY_DOCKER_ZULU_11_AMD64_VERSION=${latest_available_zulu11_amd64_version} LIFERAY_DOCKER_ZULU_11_ARM64_VERSION=${latest_available_zulu11_arm64_version} time ./build_jdk11_image.sh "${BUILD_ALL_IMAGES_PUSH}" | tee -a "${LOGS_DIR}"/jdk11.log
197+
LIFERAY_DOCKER_IMAGE_PLATFORMS="${LIFERAY_DOCKER_IMAGE_PLATFORMS}" LIFERAY_DOCKER_REPOSITORY="${LIFERAY_DOCKER_REPOSITORY}" LIFERAY_DOCKER_ZULU_11_AMD64_VERSION=${latest_available_zulu11_amd64_version} LIFERAY_DOCKER_ZULU_11_ARM64_VERSION=${latest_available_zulu11_arm64_version} time ./build_jdk11_image.sh "${BUILD_ALL_IMAGES_PUSH}" | tee -a "${LOGS_DIR}"/jdk11.log
198198

199199
if [ "${PIPESTATUS[0]}" -gt 0 ]
200200
then
@@ -222,7 +222,7 @@ function build_jdk11_jdk8_image {
222222
echo "Building Docker image JDK 11/JDK 8."
223223
echo ""
224224

225-
LIFERAY_DOCKER_IMAGE_PLATFORMS="${LIFERAY_DOCKER_IMAGE_PLATFORMS}" LIFERAY_DOCKER_ZULU_8_AMD64_VERSION=${latest_available_zulu8_amd64_version} LIFERAY_DOCKER_ZULU_8_ARM64_VERSION=${latest_available_zulu8_arm64_version} time ./build_jdk11_jdk8_image.sh "${BUILD_ALL_IMAGES_PUSH}" | tee -a "${LOGS_DIR}"/jdk11_jdk8.log
225+
LIFERAY_DOCKER_IMAGE_PLATFORMS="${LIFERAY_DOCKER_IMAGE_PLATFORMS}" LIFERAY_DOCKER_REPOSITORY="${LIFERAY_DOCKER_REPOSITORY}" LIFERAY_DOCKER_ZULU_8_AMD64_VERSION=${latest_available_zulu8_amd64_version} LIFERAY_DOCKER_ZULU_8_ARM64_VERSION=${latest_available_zulu8_arm64_version} time ./build_jdk11_jdk8_image.sh "${BUILD_ALL_IMAGES_PUSH}" | tee -a "${LOGS_DIR}"/jdk11_jdk8.log
226226

227227
if [ "${PIPESTATUS[0]}" -gt 0 ]
228228
then
@@ -247,7 +247,7 @@ function build_job_runner_image {
247247
echo "Building Docker image Job Runner."
248248
echo ""
249249

250-
LIFERAY_DOCKER_IMAGE_PLATFORMS="${LIFERAY_DOCKER_IMAGE_PLATFORMS}" time ./build_job_runner_image.sh "${BUILD_ALL_IMAGES_PUSH}" | tee -a "${LOGS_DIR}"/job_runner.log
250+
LIFERAY_DOCKER_IMAGE_PLATFORMS="${LIFERAY_DOCKER_IMAGE_PLATFORMS}" LIFERAY_DOCKER_REPOSITORY="${LIFERAY_DOCKER_REPOSITORY}" time ./build_job_runner_image.sh "${BUILD_ALL_IMAGES_PUSH}" | tee -a "${LOGS_DIR}"/job_runner.log
251251

252252
if [ "${PIPESTATUS[0]}" -gt 0 ]
253253
then
@@ -275,7 +275,7 @@ function build_zabbix_server_image {
275275
echo "Building Docker image Zabbix Server."
276276
echo ""
277277

278-
LIFERAY_DOCKER_IMAGE_PLATFORMS="${LIFERAY_DOCKER_IMAGE_PLATFORMS}" LIFERAY_DOCKER_ZABBIX_VERSION=${latest_official_zabbix_server_version} time ./build_zabbix_server_image.sh "${BUILD_ALL_IMAGES_PUSH}" | tee -a "${LOGS_DIR}"/zabbix_server.log
278+
LIFERAY_DOCKER_IMAGE_PLATFORMS="${LIFERAY_DOCKER_IMAGE_PLATFORMS}" LIFERAY_DOCKER_REPOSITORY="${LIFERAY_DOCKER_REPOSITORY}" LIFERAY_DOCKER_ZABBIX_VERSION=${latest_official_zabbix_server_version} time ./build_zabbix_server_image.sh "${BUILD_ALL_IMAGES_PUSH}" | tee -a "${LOGS_DIR}"/zabbix_server.log
279279

280280
if [ "${PIPESTATUS[0]}" -gt 0 ]
281281
then
@@ -303,7 +303,7 @@ function build_zabbix_web_image {
303303
echo "Building Docker image Zabbix Web."
304304
echo ""
305305

306-
LIFERAY_DOCKER_IMAGE_PLATFORMS="${LIFERAY_DOCKER_IMAGE_PLATFORMS}" LIFERAY_DOCKER_ZABBIX_VERSION=${latest_official_zabbix_server_web_interface_version} time ./build_zabbix_web_image.sh "${BUILD_ALL_IMAGES_PUSH}" | tee -a "${LOGS_DIR}"/zabbix_server_web_interface.log
306+
LIFERAY_DOCKER_IMAGE_PLATFORMS="${LIFERAY_DOCKER_IMAGE_PLATFORMS}" LIFERAY_DOCKER_REPOSITORY="${LIFERAY_DOCKER_REPOSITORY}" LIFERAY_DOCKER_ZABBIX_VERSION=${latest_official_zabbix_server_web_interface_version} time ./build_zabbix_web_image.sh "${BUILD_ALL_IMAGES_PUSH}" | tee -a "${LOGS_DIR}"/zabbix_server_web_interface.log
307307

308308
if [ "${PIPESTATUS[0]}" -gt 0 ]
309309
then
@@ -400,6 +400,11 @@ function main {
400400
LIFERAY_DOCKER_IMAGE_PLATFORMS=linux/amd64,linux/arm64
401401
fi
402402

403+
if [ -z "${LIFERAY_DOCKER_REPOSITORY}" ]
404+
then
405+
LIFERAY_DOCKER_REPOSITORY=liferay
406+
fi
407+
403408
validate_bundles_yml
404409

405410
LOGS_DIR=logs-$(date "$(date)" "+%Y%m%d%H%M")

Diff for: ‎build_base_image.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ function build_docker_image {
66
local image_version=$(./release_notes.sh get-version)
77

88
DOCKER_IMAGE_TAGS=()
9-
DOCKER_IMAGE_TAGS+=("${LIFERAY_DOCKER_REPOSITORY}liferay/base:${image_version}-${TIMESTAMP}")
10-
DOCKER_IMAGE_TAGS+=("${LIFERAY_DOCKER_REPOSITORY}liferay/base")
9+
DOCKER_IMAGE_TAGS+=("${LIFERAY_DOCKER_REPOSITORY}/base:${image_version}-${TIMESTAMP}")
10+
DOCKER_IMAGE_TAGS+=("${LIFERAY_DOCKER_REPOSITORY}/base")
1111

1212
if [ "${1}" == "push" ]
1313
then
@@ -39,7 +39,7 @@ function build_docker_image {
3939
}
4040

4141
function main {
42-
delete_local_images "liferay/base"
42+
delete_local_images "${LIFERAY_DOCKER_REPOSITORY}/base"
4343

4444
make_temp_directory templates/base
4545

Diff for: ‎build_bundle_image.sh

+6-6
Original file line numberDiff line numberDiff line change
@@ -80,18 +80,18 @@ function build_docker_image {
8080
do
8181
if [[ ${LIFERAY_DOCKER_RELEASE_FILE_URL%} == */snapshot-* ]]
8282
then
83-
DOCKER_IMAGE_TAGS+=("${LIFERAY_DOCKER_REPOSITORY}liferay/${DOCKER_IMAGE_NAME}:${release_branch}-${release_version_single}-${release_hash}")
84-
DOCKER_IMAGE_TAGS+=("${LIFERAY_DOCKER_REPOSITORY}liferay/${DOCKER_IMAGE_NAME}:${release_branch}-$(date "${CURRENT_DATE}" "+%Y%m%d")")
85-
DOCKER_IMAGE_TAGS+=("${LIFERAY_DOCKER_REPOSITORY}liferay/${DOCKER_IMAGE_NAME}:${release_branch}")
83+
DOCKER_IMAGE_TAGS+=("${LIFERAY_DOCKER_REPOSITORY}/${DOCKER_IMAGE_NAME}:${release_branch}-${release_version_single}-${release_hash}")
84+
DOCKER_IMAGE_TAGS+=("${LIFERAY_DOCKER_REPOSITORY}/${DOCKER_IMAGE_NAME}:${release_branch}-$(date "${CURRENT_DATE}" "+%Y%m%d")")
85+
DOCKER_IMAGE_TAGS+=("${LIFERAY_DOCKER_REPOSITORY}/${DOCKER_IMAGE_NAME}:${release_branch}")
8686
else
87-
DOCKER_IMAGE_TAGS+=("${LIFERAY_DOCKER_REPOSITORY}liferay/${DOCKER_IMAGE_NAME}:${release_version_single}-d$(./release_notes.sh get-version)-${TIMESTAMP}")
88-
DOCKER_IMAGE_TAGS+=("${LIFERAY_DOCKER_REPOSITORY}liferay/${DOCKER_IMAGE_NAME}:${release_version_single}")
87+
DOCKER_IMAGE_TAGS+=("${LIFERAY_DOCKER_REPOSITORY}/${DOCKER_IMAGE_NAME}:${release_version_single}-d$(./release_notes.sh get-version)-${TIMESTAMP}")
88+
DOCKER_IMAGE_TAGS+=("${LIFERAY_DOCKER_REPOSITORY}/${DOCKER_IMAGE_NAME}:${release_version_single}")
8989
fi
9090
done
9191

9292
if [[ "${LIFERAY_DOCKER_LATEST}" = "true" ]]
9393
then
94-
DOCKER_IMAGE_TAGS+=("${LIFERAY_DOCKER_REPOSITORY}liferay/${DOCKER_IMAGE_NAME}:latest")
94+
DOCKER_IMAGE_TAGS+=("${LIFERAY_DOCKER_REPOSITORY}/${DOCKER_IMAGE_NAME}:latest")
9595
fi
9696

9797
if [ -e "${TEMP_DIR}/liferay/.githash" ]

Diff for: ‎build_caddy_image.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ function build_docker_image {
66
local image_version=$(./release_notes.sh get-version)
77

88
DOCKER_IMAGE_TAGS=()
9-
DOCKER_IMAGE_TAGS+=("${LIFERAY_DOCKER_REPOSITORY}liferay/caddy:${image_version}-${TIMESTAMP}")
10-
DOCKER_IMAGE_TAGS+=("${LIFERAY_DOCKER_REPOSITORY}liferay/caddy")
9+
DOCKER_IMAGE_TAGS+=("${LIFERAY_DOCKER_REPOSITORY}/caddy:${image_version}-${TIMESTAMP}")
10+
DOCKER_IMAGE_TAGS+=("${LIFERAY_DOCKER_REPOSITORY}/caddy")
1111

1212
if [ "${1}" == "push" ]
1313
then

Diff for: ‎build_dynamic_rendering_image.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ function build_docker_image {
66
local image_version=$(./release_notes.sh get-version)
77

88
DOCKER_IMAGE_TAGS=()
9-
DOCKER_IMAGE_TAGS+=("${LIFERAY_DOCKER_REPOSITORY}liferay/dynamic-rendering:${image_version}-${TIMESTAMP}")
10-
DOCKER_IMAGE_TAGS+=("${LIFERAY_DOCKER_REPOSITORY}liferay/dynamic-rendering")
9+
DOCKER_IMAGE_TAGS+=("${LIFERAY_DOCKER_REPOSITORY}/dynamic-rendering:${image_version}-${TIMESTAMP}")
10+
DOCKER_IMAGE_TAGS+=("${LIFERAY_DOCKER_REPOSITORY}/dynamic-rendering")
1111

1212
if [ "${1}" == "push" ]
1313
then

Diff for: ‎build_jdk11_image.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ function build_docker_image {
66
local image_version=$(./release_notes.sh get-version)
77

88
DOCKER_IMAGE_TAGS=()
9-
DOCKER_IMAGE_TAGS+=("${LIFERAY_DOCKER_REPOSITORY}liferay/jdk11:${image_version}-${TIMESTAMP}")
10-
DOCKER_IMAGE_TAGS+=("${LIFERAY_DOCKER_REPOSITORY}liferay/jdk11")
9+
DOCKER_IMAGE_TAGS+=("${LIFERAY_DOCKER_REPOSITORY}/jdk11:${image_version}-${TIMESTAMP}")
10+
DOCKER_IMAGE_TAGS+=("${LIFERAY_DOCKER_REPOSITORY}/jdk11")
1111

1212
if [ "${1}" == "push" ]
1313
then
@@ -43,7 +43,7 @@ function build_docker_image {
4343
}
4444

4545
function main {
46-
delete_local_images "liferay/jdk11"
46+
delete_local_images "${LIFERAY_DOCKER_REPOSITORY}/jdk11"
4747

4848
make_temp_directory templates/jdk11
4949

Diff for: ‎build_jdk11_jdk8_image.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ function build_docker_image {
66
local image_version=$(./release_notes.sh get-version)
77

88
DOCKER_IMAGE_TAGS=()
9-
DOCKER_IMAGE_TAGS+=("${LIFERAY_DOCKER_REPOSITORY}liferay/jdk11-jdk8:${image_version}-${TIMESTAMP}")
10-
DOCKER_IMAGE_TAGS+=("${LIFERAY_DOCKER_REPOSITORY}liferay/jdk11-jdk8")
9+
DOCKER_IMAGE_TAGS+=("${LIFERAY_DOCKER_REPOSITORY}/jdk11-jdk8:${image_version}-${TIMESTAMP}")
10+
DOCKER_IMAGE_TAGS+=("${LIFERAY_DOCKER_REPOSITORY}/jdk11-jdk8")
1111

1212
if [ "${1}" == "push" ]
1313
then
@@ -43,7 +43,7 @@ function build_docker_image {
4343
}
4444

4545
function main {
46-
delete_local_images "liferay/jdk11-jdk8"
46+
delete_local_images "${LIFERAY_DOCKER_REPOSITORY}/jdk11-jdk8"
4747

4848
make_temp_directory templates/jdk11-jdk8
4949

Diff for: ‎build_job_runner_image.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ function build_docker_image {
66
local image_version=$(./release_notes.sh get-version)
77

88
DOCKER_IMAGE_TAGS=()
9-
DOCKER_IMAGE_TAGS+=("${LIFERAY_DOCKER_REPOSITORY}liferay/job-runner:${image_version}-${TIMESTAMP}")
10-
DOCKER_IMAGE_TAGS+=("${LIFERAY_DOCKER_REPOSITORY}liferay/job-runner")
9+
DOCKER_IMAGE_TAGS+=("${LIFERAY_DOCKER_REPOSITORY}/job-runner:${image_version}-${TIMESTAMP}")
10+
DOCKER_IMAGE_TAGS+=("${LIFERAY_DOCKER_REPOSITORY}/job-runner")
1111

1212
if [ "${1}" == "push" ]
1313
then

Diff for: ‎build_zabbix_server_image.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ function build_docker_image {
66
local image_version=$(./release_notes.sh get-version)
77

88
DOCKER_IMAGE_TAGS=()
9-
DOCKER_IMAGE_TAGS+=("${LIFERAY_DOCKER_REPOSITORY}liferay/zabbix-server:${image_version}-${TIMESTAMP}")
10-
DOCKER_IMAGE_TAGS+=("${LIFERAY_DOCKER_REPOSITORY}liferay/zabbix-server")
9+
DOCKER_IMAGE_TAGS+=("${LIFERAY_DOCKER_REPOSITORY}/zabbix-server:${image_version}-${TIMESTAMP}")
10+
DOCKER_IMAGE_TAGS+=("${LIFERAY_DOCKER_REPOSITORY}/zabbix-server")
1111

1212
if [ "${1}" == "push" ]
1313
then
@@ -41,7 +41,7 @@ function build_docker_image {
4141
}
4242

4343
function main {
44-
delete_local_images "liferay/zabbix-server"
44+
delete_local_images "${LIFERAY_DOCKER_REPOSITORY}/zabbix-server"
4545

4646
make_temp_directory templates/zabbix-server
4747

Diff for: ‎build_zabbix_web_image.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ function build_docker_image {
66
local image_version=$(./release_notes.sh get-version)
77

88
DOCKER_IMAGE_TAGS=()
9-
DOCKER_IMAGE_TAGS+=("${LIFERAY_DOCKER_REPOSITORY}liferay/zabbix-web:${image_version}-${TIMESTAMP}")
10-
DOCKER_IMAGE_TAGS+=("${LIFERAY_DOCKER_REPOSITORY}liferay/zabbix-web")
9+
DOCKER_IMAGE_TAGS+=("${LIFERAY_DOCKER_REPOSITORY}/zabbix-web:${image_version}-${TIMESTAMP}")
10+
DOCKER_IMAGE_TAGS+=("${LIFERAY_DOCKER_REPOSITORY}/zabbix-web")
1111

1212
if [ "${1}" == "push" ]
1313
then
@@ -41,7 +41,7 @@ function build_docker_image {
4141
}
4242

4343
function main {
44-
delete_local_images "liferay/zabbix-web"
44+
delete_local_images "${LIFERAY_DOCKER_REPOSITORY}/zabbix-web"
4545

4646
make_temp_directory templates/zabbix-web
4747

0 commit comments

Comments
 (0)