From a14220a814197e7b42708d790b54dc5b281e583c Mon Sep 17 00:00:00 2001 From: mickamy Date: Sat, 6 Jan 2024 08:21:01 +0900 Subject: [PATCH] ci: support only arm64, x86_64 or others --- .github/workflows/build_and_push_images.yml | 5 ++--- Makefile | 14 +++++--------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build_and_push_images.yml b/.github/workflows/build_and_push_images.yml index 2e42857a..fca8e821 100644 --- a/.github/workflows/build_and_push_images.yml +++ b/.github/workflows/build_and_push_images.yml @@ -27,11 +27,10 @@ jobs: - "python" - "ruby" arch: + - "arm64" - "arm64v8" - - "armv7l" - - "ppc64le" - - "s390x" - "x86_64" + - "unknown" env: ISHOCON_APP_LANG: ${{ matrix.language }} UNAME: ${{ secrets.DOCKER_HUB_USERNAME }} diff --git a/Makefile b/Makefile index dcca09e5..2f139343 100644 --- a/Makefile +++ b/Makefile @@ -8,16 +8,12 @@ ifeq ($(ARCH),) endif UBUNTU_VERSION = 18.04 -ifeq ($(ARCH), arm64) - BASE_IMAGE = arm64v8/ubuntu:$(UBUNTU_VERSION) -else ifeq ($(ARCH), aarch64) + + +ifeq ($(filter $(ARCH),arm64 aarch64),) BASE_IMAGE = arm64v8/ubuntu:$(UBUNTU_VERSION) -else ifeq ($(ARCH), armv7l) - BASE_IMAGE = armv7l/ubuntu:$(UBUNTU_VERSION) -else ifeq ($(ARCH), ppc64le) - BASE_IMAGE = ppc64le/ubuntu:$(UBUNTU_VERSION) -else ifeq ($(ARCH), s390x) - BASE_IMAGE = s390x/ubuntu:$(UBUNTU_VERSION) +else ifeq ($(ARCH), x86_64) + BASE_IMAGE = amd64/ubuntu:$(UBUNTU_VERSION) else BASE_IMAGE = ubuntu:$(UBUNTU_VERSION) endif