Merge pull request #13 from mickamy/feat/apple-silicon

ci: try layer caching again

Author: mickamy

.github/workflows/benchmark.yml

@@ -35,10 +35,16 @@ jobs:
           sed -i 's/ishocon2-bench/${{ env.UNAME }}\/ishocon2-bench/g' ./docker-compose.yml
           sed -i 's/ishocon2-app-${{ env.ISHOCON_APP_LANG }}/${{ env.UNAME }}\/ishocon2-app-${{ env.ISHOCON_APP_LANG }}/g' ./docker-compose.yml
           cat ./docker-compose.yml
-      - name: Pull docker images
-        run: make pull
-      - run: make build
-        timeout-minutes: 10
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ env.UNAME }}
+          password: ${{ secrets.DOCKER_HUB_TOKEN }}
+      - name: Build images
+        run: |
+          make pull || true
+          make build
+        timeout-minutes: 20
       - run: make up bench-with-db-init
         timeout-minutes: 10
       - name: Dump docker logs

.github/workflows/build_and_push_images.yml

@@ -16,37 +16,55 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 60
     env:
-      ISHOCON_APP_LANG: ${{ matrix.language }}
       UNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
     steps:
+      - run: echo "DATE=$(date +%Y%m%d)" >> $GITHUB_ENV
       - uses: actions/checkout@v4
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
           username: ${{ env.UNAME }}
           password: ${{ secrets.DOCKER_HUB_TOKEN }}
+      - name: Cache docker layers
+        uses: actions/cache@v3
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-
       - name: Build and push bench image
         uses: docker/build-push-action@v5
         with:
           context: .
           push: true
           file: ./docker/benchmarker/Dockerfile
-          tags: ${{ env.UNAME }}/ishocon2-bench:latest
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+          tags: ${{ env.UNAME }}/ishocon2-bench:latest,${{ env.UNAME }}/ishocon2-bench:${{ 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 base image
         uses: docker/build-push-action@v5
         with:
           context: .
           push: true
           file: ./docker/app/base/Dockerfile
-          tags: ${{ env.UNAME }}/ishocon2-app-base:latest
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+          tags: ${{ env.UNAME }}/ishocon2-app-base:latest,${{ 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: Move new cache to the place where to be cached
+        run: |
+          echo "Temporary fix for cleaning up old cache."
+          echo "See isssues:
+            - https://github.com/docker/build-push-action/issues/252
+            - https://github.com/moby/buildkit/issues/1896
+          "
+          rm -rf /tmp/.buildx-cache
+          mv /tmp/.buildx-cache-new /tmp/.buildx-cache
   build-app-images:
     name: Build app images
     runs-on: ubuntu-latest
@@ -66,21 +84,42 @@ jobs:
       ISHOCON_APP_LANG: ${{ matrix.language }}
       UNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
     steps:
+      - run: echo "DATE=$(date +%Y%m%d)" >> $GITHUB_ENV
       - uses: actions/checkout@v4
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
           username: ${{ env.UNAME }}
           password: ${{ secrets.DOCKER_HUB_TOKEN }}
+      - name: Cache docker layers
+        uses: actions/cache@v3
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ matrix.language }}-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-${{ matrix.language }}
+            ${{ runner.os }}-buildx
       - name: Build and push app image
         uses: docker/build-push-action@v5
         with:
           context: .
           push: true
-          file: ./docker/app/base/Dockerfile
-          tags: ${{ env.UNAME }}/ishocon2-app-${{ env.ISHOCON_APP_LANG }}:latest
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+          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: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
+      - name: Move new cache to the place where to be cached
+        run: |
+          echo "Temporary fix for cleaning up old cache."
+          echo "See isssues:
+            - https://github.com/docker/build-push-action/issues/252
+            - https://github.com/moby/buildkit/issues/1896
+          "
+          rm -rf /tmp/.buildx-cache
+          mv /tmp/.buildx-cache-new /tmp/.buildx-cache

.gitignore

@@ -47,3 +47,5 @@ __pycache__/
 
 # go
 /webapp/go/webapp
+
+.secret

Makefile

@@ -7,36 +7,20 @@ 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 \
-	-t $(UNAME)/ishocon2-app-base:${ARCH} \
 	.;
 
 build-bench:
 	docker build \
-	--build-arg BASE_IMAGE=$(BASE_IMAGE) \
 	-f ./docker/benchmarker/Dockerfile \
 	-t ishocon2-bench:latest \
 	-t $(UNAME)/ishocon2-bench:latest \
-	-t $(UNAME)/ishocon2-bench:${ARCH} \
 	.;
 
 build-app: change-lang build-base
@@ -46,16 +30,25 @@ build-app: change-lang build-base
 	-f ./docker/app/$(ISHOCON_APP_LANG)/Dockerfile \
 	-t ishocon2-app-$(ISHOCON_APP_LANG):latest \
 	-t $(UNAME)/ishocon2-app-$(ISHOCON_APP_LANG):latest \
-	-t $(UNAME)/ishocon2-app-$(ISHOCON_APP_LANG):${ARCH} \
 	.;
 
 build: build-bench build-app
 	@echo "Build done."
 
-pull:
+pull-bench:
 	docker pull $(UNAME)/ishocon2-bench:latest;
+	docker tag $(UNAME)/ishocon2-bench:latest ishocon2-bench:latest;
+
+pull-base:
 	docker pull $(UNAME)/ishocon2-app-base:latest;
+	docker tag $(UNAME)/ishocon2-app-base:latest $(LOCAL_ISHOCON_BASE_IMAGE);
+
+pull-app: check-lang
 	docker pull $(UNAME)/ishocon2-app-$(ISHOCON_APP_LANG):latest;
+	docker tag $(UNAME)/ishocon2-app-$(ISHOCON_APP_LANG):latest ishocon2-app-$(ISHOCON_APP_LANG):latest;
+
+pull: pull-bench pull-base pull-app
+	@echo "Pull done."
 
 push:
 	docker push $(UNAME)/ishocon2-bench:latest;

docker/app/base/Dockerfile

@@ -1,16 +1,16 @@
-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
-ENV TZ Asia/Tokyo
+
+ENV LANG=en_US.UTF-8 \
+    LC_ALL=C.UTF-8 \
+    TZ=Asia/Tokyo
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 RUN apt-get update && \
-    apt-get install -y wget sudo less vim tzdata \
-    nginx \
+    apt-get install -y sudo wget less vim tzdata nginx \
     # 各言語のインストールに必要なもの下準備 \
-    curl git gcc make libssl-dev libreadline-dev
+    curl git gcc make libssl-dev libreadline-dev && \
+    apt-get clean
 
 # ishocon ユーザ作成
 RUN groupadd -g 1001 ishocon && \

docker/app/crystal/Dockerfile

@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=showwin/ishocon2_app_base:latest
+ARG BASE_IMAGE=ishocon2-app-base:latest
 FROM ${BASE_IMAGE}
 
 RUN sudo apt update && \
@@ -11,7 +11,8 @@ RUN curl -fsSL https://packagecloud.io/84codes/crystal/gpgkey | gpg --dearmor |
     . /etc/os-release && \
     echo "deb https://packagecloud.io/84codes/crystal/$ID $VERSION_CODENAME main" | sudo tee /etc/apt/sources.list.d/84codes_crystal.list && \
     sudo apt-get update && \
-    sudo apt-get install -y crystal
+    sudo apt-get install -y crystal && \
+    sudo apt-get clean
 
 # アプリケーション
 COPY --chown=ishocon:ishocon webapp/ /home/ishocon/webapp

docker/app/go/Dockerfile

@@ -1,12 +1,6 @@
-ARG BASE_IMAGE=showwin/ishocon2_app_base:latest
+ARG BASE_IMAGE=ishocon2-app-base:latest
 FROM ${BASE_IMAGE}
 
-# Go のインストール
-ARG TARGETARCH
-ENV GOARCH ${TARGETARCH}
-
-RUN sudo apt-get update
-
 # Go のインストール
 ARG TARGETARCH
 RUN sudo wget -q https://dl.google.com/go/go1.15.8.linux-${TARGETARCH}.tar.gz && \
@@ -21,7 +15,7 @@ ENV PATH $PATH:$GOROOT/bin
 COPY --chown=ishocon:ishocon webapp/ /home/ishocon/webapp
 RUN cd ~/webapp/go && \
     mkdir -p /tmp/go && \
-    go build -x -o /tmp/go/webapp *.go
+    GOARCH=${TARGETARCH} go build -x -o /tmp/go/webapp *.go
 
 WORKDIR /home/ishocon
 

docker/app/nodejs/Dockerfile

@@ -1,10 +1,11 @@
-ARG BASE_IMAGE=showwin/ishocon2_app_base:latest
+ARG BASE_IMAGE=ishocon2-app-base:latest
 FROM ${BASE_IMAGE}
 
 # NodeJS のインストール
 RUN sudo apt-get update
-RUN sudo apt install -y nodejs-dev node-gyp libssl1.0-dev
-RUN sudo apt install -y nodejs npm
+RUN sudo apt install -y nodejs-dev node-gyp libssl1.0-dev \
+    nodejs npm && \
+    sudo apt-get clean
 
 # アプリケーション
 COPY --chown=ishocon:ishocon webapp/ /home/ishocon/webapp

docker/app/php/Dockerfile

@@ -1,10 +1,11 @@
-ARG BASE_IMAGE=showwin/ishocon2_app_base:latest
+ARG BASE_IMAGE=ishocon2-app-base:latest
 FROM ${BASE_IMAGE}
 
 # PHP のインストール
 RUN sudo mkdir /run/php
-RUN sudo apt-get update
-RUN sudo apt install -y php php-fpm php-mysql php-cli
+RUN sudo apt-get update && \
+    sudo apt install -y php php-fpm php-mysql php-cli && \
+    sudo apt-get clean
 
 # アプリケーション
 COPY --chown=ishocon:ishocon webapp/ /home/ishocon/webapp

docker/app/python/Dockerfile

@@ -1,9 +1,10 @@
-ARG BASE_IMAGE=showwin/ishocon2_app_base:latest
+ARG BASE_IMAGE=ishocon2-app-base:latest
 FROM ${BASE_IMAGE}
 
 # Python のインストール
-RUN sudo apt-get update
-RUN sudo apt-get install -y zlib1g-dev
+RUN sudo apt-get update && \
+    sudo apt-get install -y zlib1g-dev && \
+    sudo apt-get clean
 RUN git clone https://github.com/pyenv/pyenv.git ~/.pyenv && \
     PYENV_ROOT="$HOME/.pyenv" && PATH="$PYENV_ROOT/bin:$PATH" && \
     eval "$(pyenv init -)" && \

docker/app/ruby/Dockerfile

@@ -1,9 +1,10 @@
-ARG BASE_IMAGE=showwin/ishocon2_app_base:latest
+ARG BASE_IMAGE=ishocon2-app-base:latest
 FROM ${BASE_IMAGE}
 
 # Ruby のインストール
 RUN sudo apt-get update && \
     sudo apt-get install -y ruby-dev libmysqlclient-dev libffi6 libffi-dev libyaml-dev bzip2 && \
+    sudo apt-get clean && \
     git clone https://github.com/sstephenson/rbenv.git ~/.rbenv
 RUN PATH="$HOME/.rbenv/bin:$PATH" && \
     eval "$(rbenv init -)" && \

docker/benchmarker/Dockerfile

@@ -1,27 +1,22 @@
-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
 ENV TZ Asia/Tokyo
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
-# MySQL のインストール
-RUN ["/bin/bash", "-c", "debconf-set-selections <<< 'mysql-server mysql-server/root_password password ishocon'"]
-RUN ["/bin/bash", "-c", "debconf-set-selections <<< 'mysql-service mysql-server/mysql-apt-config string 4'"]
-
 RUN apt-get update && \
-    apt-get install -y wget mysql-server git tzdata
+    apt-get install -y wget tzdata mysql-server && \
+    apt-get clean
 
 # Go のインストール
 ARG TARGETARCH
 RUN wget -q https://dl.google.com/go/go1.13.15.linux-${TARGETARCH}.tar.gz && \
     tar -C /usr/local -xzf go1.13.15.linux-${TARGETARCH}.tar.gz && \
     rm go1.13.15.linux-${TARGETARCH}.tar.gz
-ENV PATH $PATH:/usr/local/go/bin
-ENV GOROOT /usr/local/go
-ENV GOPATH $HOME/.local/go
-ENV PATH $PATH:$GOROOT/bin
+ENV PATH=$PATH:/usr/local/go/bin \
+    GOROOT=/usr/local/go \
+    GOPATH=$HOME/.local/go
 
 # build benchmark
 COPY admin/benchmarker /root/admin/benchmarker
@@ -34,12 +29,16 @@ COPY admin/config/my.bench.cnf /etc/mysql/my.cnf
 
 WORKDIR /root
 
+# MySQL のインストール
+RUN ["/bin/bash", "-c", "debconf-set-selections <<< 'mysql-server mysql-server/root_password password ishocon'"]
+RUN ["/bin/bash", "-c", "debconf-set-selections <<< 'mysql-service mysql-server/mysql-apt-config string 4'"]
+
 # 初期データ投入
 RUN service mysql start && \
     mysql -u root -pishocon -e 'CREATE DATABASE IF NOT EXISTS ishocon2;' && \
     mysql -u root -pishocon -e "CREATE USER IF NOT EXISTS ishocon IDENTIFIED BY 'ishocon';" && \
     mysql -u root -pishocon -e 'GRANT ALL ON *.* TO ishocon;' && \
-    tar -jxvf ~/admin/ishocon2.dump.tar.bz2 -C ~/admin && mysql -u root -pishocon ishocon2 < ~/admin/ishocon2.dump && \ 
+    tar -jxvf ~/admin/ishocon2.dump.tar.bz2 -C ~/admin && mysql -u root -pishocon ishocon2 < ~/admin/ishocon2.dump && \
     rm -rf ~/admin/ishocon2.dump