fix: BASE_IMAGE should be selected via platform

mickamy · Jan 7, 2024 · 24cb8a4 · 24cb8a4
1 parent 4fa9c5a
commit 24cb8a4
Showing 11 changed files with 20 additions and 38 deletions.
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -62,14 +62,23 @@ jobs:
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
           platforms: linux/amd64,linux/arm64/v8
-      - name: Build and push app image
+      - name: Build and push base image
         uses: docker/build-push-action@v5
         with:
           context: .
           push: true
           file: ./docker/app/base/Dockerfile
+          tags: ${{ env.UNAME }}/ishocon2-app-base:${{ env.DATE }}
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+          platforms: linux/amd64,linux/arm64/v8
+      - name: Build and push app image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          file: ./docker/app/${{ env.ISHOCON_APP_LANG }}/Dockerfile
           tags: ${{ env.UNAME }}/ishocon2-app-${{ env.ISHOCON_APP_LANG }}:${{ env.DATE }}
-          build-args: BASE_IMAGE=${{ env.UNAME }}/ishocon2-app-base:latest
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
           platforms: linux/amd64,linux/arm64/v8

diff --git a/.github/workflows/build_and_push_images.yml b/.github/workflows/build_and_push_images.yml
@@ -99,15 +99,13 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-buildx-${{ matrix.language }}
             ${{ runner.os }}-buildx
-      - run: make pull-app
       - name: Build and push app image
         uses: docker/build-push-action@v5
         with:
           context: .
           push: true
-          file: ./docker/app/base/Dockerfile
+          file: ./docker/app/${{ env.ISHOCON_APP_LANG }}/Dockerfile
           tags: ${{ env.UNAME }}/ishocon2-app-${{ env.ISHOCON_APP_LANG }}:latest,${{ env.UNAME }}/ishocon2-app-${{ env.ISHOCON_APP_LANG }}:${{ env.DATE }}
-          build-args: BASE_IMAGE=${{ env.UNAME }}/ishocon2-app-base:${{ env.DATE }}
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
           platforms: linux/amd64,linux/arm64/v8

diff --git a/Makefile b/Makefile
@@ -7,31 +7,17 @@ ifeq ($(ARCH),)
 	ARCH = $(shell uname -m)
 endif
 
-UBUNTU_VERSION = 18.04
-
-ifeq ($(ARCH), x86_64)
-	BASE_IMAGE = amd64/ubuntu:$(UBUNTU_VERSION)
-else ifeq ($(ARCH), arm64)
-	BASE_IMAGE = arm64v8/ubuntu:$(UBUNTU_VERSION)
-else ifeq ($(ARCH), aarch64)
-	BASE_IMAGE = arm64v8/ubuntu:$(UBUNTU_VERSION)
-else
-	BASE_IMAGE = ubuntu:$(UBUNTU_VERSION)
-endif
-
 LOCAL_ISHOCON_BASE_IMAGE = ishocon2-app-base:latest
 
 build-base:
 	docker build \
-	--build-arg BASE_IMAGE=$(BASE_IMAGE) \
 	-f ./docker/app/base/Dockerfile \
 	-t $(LOCAL_ISHOCON_BASE_IMAGE) \
 	-t $(UNAME)/ishocon2-app-base:latest \
 	.;
 
 build-bench:
 	docker build \
-	--build-arg BASE_IMAGE=$(BASE_IMAGE) \
 	-f ./docker/benchmarker/Dockerfile \
 	-t ishocon2-bench:latest \
 	-t $(UNAME)/ishocon2-bench:latest \
@@ -40,7 +26,6 @@ build-bench:
 build-app: change-lang build-base
 	ISHOCON_APP_LANG=$(ISHOCON_APP_LANG:python)
 	docker build \
-	--build-arg BASE_IMAGE=$(LOCAL_ISHOCON_BASE_IMAGE) \
 	-f ./docker/app/$(ISHOCON_APP_LANG)/Dockerfile \
 	-t ishocon2-app-$(ISHOCON_APP_LANG):latest \
 	-t $(UNAME)/ishocon2-app-$(ISHOCON_APP_LANG):latest \

diff --git a/docker/app/base/Dockerfile b/docker/app/base/Dockerfile
@@ -1,9 +1,6 @@
-ARG BASE_IMAGE=ubuntu:18.04
-FROM ${BASE_IMAGE}
+FROM ubuntu:18.04
 
 
-USER root
-
 ENV LANG=en_US.UTF-8 \
     LC_ALL=C.UTF-8 \
     TZ=Asia/Tokyo

diff --git a/docker/app/crystal/Dockerfile b/docker/app/crystal/Dockerfile
@@ -1,5 +1,4 @@
-ARG BASE_IMAGE=showwin/ishocon2_app_base:latest
-FROM ${BASE_IMAGE}
+FROM showwin/ishocon2_app_base:latest
 
 RUN sudo apt update && \
     sudo apt install -y \

diff --git a/docker/app/go/Dockerfile b/docker/app/go/Dockerfile
@@ -1,5 +1,4 @@
-ARG BASE_IMAGE=showwin/ishocon2_app_base:latest
-FROM ${BASE_IMAGE}
+FROM showwin/ishocon2_app_base:latest
 
 # Go のインストール
 ARG TARGETARCH

diff --git a/docker/app/nodejs/Dockerfile b/docker/app/nodejs/Dockerfile
@@ -1,5 +1,4 @@
-ARG BASE_IMAGE=showwin/ishocon2_app_base:latest
-FROM ${BASE_IMAGE}
+FROM showwin/ishocon2_app_base:latest
 
 # NodeJS のインストール
 RUN sudo apt-get update

diff --git a/docker/app/php/Dockerfile b/docker/app/php/Dockerfile
@@ -1,5 +1,4 @@
-ARG BASE_IMAGE=showwin/ishocon2_app_base:latest
-FROM ${BASE_IMAGE}
+FROM showwin/ishocon2_app_base:latest
 
 # PHP のインストール
 RUN sudo mkdir /run/php

diff --git a/docker/app/python/Dockerfile b/docker/app/python/Dockerfile
@@ -1,5 +1,4 @@
-ARG BASE_IMAGE=showwin/ishocon2_app_base:latest
-FROM ${BASE_IMAGE}
+FROM showwin/ishocon2_app_base:latest
 
 # Python のインストール
 RUN sudo apt-get update && \

diff --git a/docker/app/ruby/Dockerfile b/docker/app/ruby/Dockerfile
@@ -1,5 +1,4 @@
-ARG BASE_IMAGE=showwin/ishocon2_app_base:latest
-FROM ${BASE_IMAGE}
+FROM showwin/ishocon2_app_base:latest
 
 # Ruby のインストール
 RUN sudo apt-get update && \

diff --git a/docker/benchmarker/Dockerfile b/docker/benchmarker/Dockerfile
@@ -1,5 +1,4 @@
-ARG BASE_IMAGE=ubuntu:18.04
-FROM ${BASE_IMAGE}
+FROM ubuntu:18.04
 
 ENV LANG en_US.UTF-8
 ENV LC_ALL=C.UTF-8