From c0732a4139dbabcf95a3678b27b6037a8ef1e5ee Mon Sep 17 00:00:00 2001 From: Mitchell Syer Date: Fri, 7 Oct 2022 15:01:05 -0400 Subject: [PATCH] Use Ubuntu focal --- .github/workflows/build_container_images.yml | 19 ++++++++++--------- .github/workflows/build_test_images.yml | 4 ++-- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build_container_images.yml b/.github/workflows/build_container_images.yml index 4f5ee48..869adcc 100644 --- a/.github/workflows/build_container_images.yml +++ b/.github/workflows/build_container_images.yml @@ -23,7 +23,8 @@ on: env: build_repo_docker: 'tachidesk' - build_base_image_temurin: 'eclipse-temurin:11-jre' + build_base_image_temurin_ubuntu: 'eclipse-temurin:11-jre-focal' + build_base_image_temurin_alpine: 'eclipse-temurin:11-jre-alpine' build_base_image_temurin_platform: 'linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x' build_base_image_temurin_platform_testing: 'linux/amd64' startup_script_url: 'https://raw.githubusercontent.com/${{ github.repository }}/main/scripts/startup_script.sh' @@ -194,7 +195,7 @@ jobs: file: scripts/dockerfiles/Git_Actions-Dockerfile platforms: ${{ env.build_base_image_temurin_platform_testing }} build-args: | - BASE_IMAGE=${{ env.build_base_image_temurin }} + BASE_IMAGE=${{ env.build_base_image_temurin_ubuntu }} BUILD_DATE=${{ steps.get_latest_release_metadata.outputs.build_date }} IMAGE_VERSION=${{ steps.get_latest_release_metadata.outputs.release_version }} IMAGE_TYPE=stable-ubuntu @@ -243,7 +244,7 @@ jobs: file: scripts/dockerfiles/Git_Actions-Dockerfile platforms: ${{ env.build_base_image_temurin_platform_testing }} build-args: | - BASE_IMAGE=${{ env.build_base_image_temurin }}-alpine + BASE_IMAGE=${{ env.build_base_image_temurin_alpine }} BUILD_DATE=${{ steps.get_latest_release_metadata.outputs.build_date }} IMAGE_VERSION=${{ steps.get_latest_release_metadata.outputs.release_version }} IMAGE_TYPE=stable-alpine @@ -328,7 +329,7 @@ jobs: platforms: ${{ env.build_base_image_temurin_platform }} push: ${{ needs.check_stable.outputs.enable_build_publish == 'true' }} build-args: | - BASE_IMAGE=${{ env.build_base_image_temurin }} + BASE_IMAGE=${{ env.build_base_image_temurin_ubuntu }} BUILD_DATE=${{ needs.check_stable.outputs.build_date }} IMAGE_VERSION=${{ needs.check_stable.outputs.release_version }} IMAGE_TYPE=stable-ubuntu @@ -355,7 +356,7 @@ jobs: platforms: ${{ env.build_base_image_temurin_platform }} push: ${{ needs.check_stable.outputs.enable_build_publish == 'true' }} build-args: | - BASE_IMAGE=${{ env.build_base_image_temurin }}-alpine + BASE_IMAGE=${{ env.build_base_image_temurin_alpine }} BUILD_DATE=${{ needs.check_stable.outputs.build_date }} IMAGE_VERSION=${{ needs.check_stable.outputs.release_version }} IMAGE_TYPE=stable-alpine @@ -458,7 +459,7 @@ jobs: file: scripts/dockerfiles/Git_Actions-Dockerfile platforms: ${{ env.build_base_image_temurin_platform_testing }} build-args: | - BASE_IMAGE=${{ env.build_base_image_temurin }} + BASE_IMAGE=${{ env.build_base_image_temurin_ubuntu }} BUILD_DATE=${{ steps.get_latest_release_metadata.outputs.build_date }} IMAGE_VERSION=${{ steps.get_latest_release_metadata.outputs.release_version }} IMAGE_TYPE=preview-ubuntu @@ -509,7 +510,7 @@ jobs: file: scripts/dockerfiles/Git_Actions-Dockerfile platforms: ${{ env.build_base_image_temurin_platform_testing }} build-args: | - BASE_IMAGE=${{ env.build_base_image_temurin }}-alpine + BASE_IMAGE=${{ env.build_base_image_temurin_alpine }} BUILD_DATE=${{ steps.get_latest_release_metadata.outputs.build_date }} IMAGE_VERSION=${{ steps.get_latest_release_metadata.outputs.release_version }} IMAGE_TYPE=preview-alpine @@ -596,7 +597,7 @@ jobs: platforms: ${{ env.build_base_image_temurin_platform }} push: ${{ needs.check_preview.outputs.enable_build_publish == 'true' }} build-args: | - BASE_IMAGE=${{ env.build_base_image_temurin }} + BASE_IMAGE=${{ env.build_base_image_temurin_ubuntu }} BUILD_DATE=${{ needs.check_preview.outputs.build_date }} IMAGE_VERSION=${{ needs.check_preview.outputs.release_version }} IMAGE_TYPE=preview-ubuntu @@ -621,7 +622,7 @@ jobs: platforms: ${{ env.build_base_image_temurin_platform }} push: ${{ needs.check_preview.outputs.enable_build_publish == 'true' }} build-args: | - BASE_IMAGE=${{ env.build_base_image_temurin }}-alpine + BASE_IMAGE=${{ env.build_base_image_temurin_alpine }} BUILD_DATE=${{ needs.check_preview.outputs.build_date }} IMAGE_VERSION=${{ needs.check_preview.outputs.release_version }} IMAGE_TYPE=preview-alpine diff --git a/.github/workflows/build_test_images.yml b/.github/workflows/build_test_images.yml index 5cea5c3..49f96d1 100644 --- a/.github/workflows/build_test_images.yml +++ b/.github/workflows/build_test_images.yml @@ -15,7 +15,7 @@ on: env: build_repo_docker: 'tachidesk' - build_base_image_temurin: 'eclipse-temurin:11-jre' + build_base_image_temurin_ubuntu: 'eclipse-temurin:11-jre-focal' build_base_image_temurin_platform: 'linux/amd64' startup_script_url: 'https://raw.githubusercontent.com/${{ github.repository }}/main/scripts/startup_script.sh' tachidesk_webui_stable_url: 'https://api.github.com/repos/suwayomi/Tachidesk-Server/releases/latest' @@ -77,7 +77,7 @@ jobs: platforms: ${{ env.build_base_image_temurin_platform }} push: true build-args: | - BASE_IMAGE=${{ env.build_base_image_temurin }} + BASE_IMAGE=${{ env.build_base_image_temurin_ubuntu }} BUILD_DATE=${{ steps.get_latest_release_metadata.outputs.build_date }} IMAGE_VERSION=${{ steps.get_latest_release_metadata.outputs.release_version }} IMAGE_TYPE=develop-ubuntu