Skip to content

Commit 1f05aeb

Browse files
committed
ci: specify BASE_IMAGE by ARG
1 parent ed1a640 commit 1f05aeb

File tree

7 files changed

+13
-6
lines changed

7 files changed

+13
-6
lines changed

.github/workflows/build_and_push_images.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ jobs:
113113
push: true
114114
file: ./docker/app/${{ env.ISHOCON_APP_LANG }}/Dockerfile
115115
tags: ${{ env.UNAME }}/ishocon2-app-${{ env.ISHOCON_APP_LANG }}:latest,${{ env.UNAME }}/ishocon2-app-${{ env.ISHOCON_APP_LANG }}:${{ env.DATE }}
116+
build-args: BASE_IMAGE=${{ env.UNAME }}/ishocon2-app-base:latest
116117
cache-from: type=local,src=/tmp/.buildx-cache
117118
cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
118119
platforms: linux/amd64,linux/arm64/v8

docker/app/crystal/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
FROM ishocon2-app-base:latest
1+
ARG BASE_IMAGE=ishocon2-app-base:latest
2+
FROM ${BASE_IMAGE}
23

34
RUN sudo apt update && \
45
sudo apt install -y \

docker/app/go/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
FROM ishocon2-app-base:latest
1+
ARG BASE_IMAGE=ishocon2-app-base:latest
2+
FROM ${BASE_IMAGE}
23

34
# Go のインストール
45
ARG TARGETARCH

docker/app/nodejs/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
FROM ishocon2-app-base:latest
1+
ARG BASE_IMAGE=ishocon2-app-base:latest
2+
FROM ${BASE_IMAGE}
23

34
# NodeJS のインストール
45
RUN sudo apt-get update

docker/app/php/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
FROM ishocon2-app-base:latest
1+
ARG BASE_IMAGE=ishocon2-app-base:latest
2+
FROM ${BASE_IMAGE}
23

34
# PHP のインストール
45
RUN sudo mkdir /run/php

docker/app/python/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
FROM ishocon2-app-base:latest
1+
ARG BASE_IMAGE=ishocon2-app-base:latest
2+
FROM ${BASE_IMAGE}
23

34
# Python のインストール
45
RUN sudo apt-get update && \

docker/app/ruby/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
FROM ishocon2-app-base:latest
1+
ARG BASE_IMAGE=ishocon2-app-base:latest
2+
FROM ${BASE_IMAGE}
23

34
# Ruby のインストール
45
RUN sudo apt-get update && \

0 commit comments

Comments
 (0)