diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 6351ea8..bccf531 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -11,9 +11,11 @@ jobs: build: runs-on: ubuntu-latest steps: - - name: Checkout + - &checkout + name: Checkout uses: actions/checkout@v2 - - name: Checkout upstream repo + - &checkout-upstream + name: Checkout upstream repo uses: actions/checkout@v2 with: repository: tdlib/telegram-bot-api @@ -24,23 +26,20 @@ jobs: with: path: /tmp/.buildx-cache key: ${{ runner.os }}-buildx-${{ github.sha }} - restore-keys: | - ${{ runner.os }}-buildx- - - name: Set up QEMU + - &setup-qemu + name: Set up QEMU uses: docker/setup-qemu-action@v1 - - name: Set up Docker Buildx + - &setup-buildx + name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 - - name: Login to DockerHub + - &login-dockerhub + name: Login to DockerHub uses: docker/login-action@v1 with: username: ${{ secrets.DOCKERHUB_LOGIN }} password: ${{ secrets.DOCKERHUB_TOKEN }} - # - name: Get current time - # uses: 1466587594/get-current-time@v2 - # id: current-time - # with: - # format: YYYYMMDD - - name: Set version + - &set-version + name: Set version id: current-version run: | TG_SERVER_VERSION=$(cat telegram-bot-api/CMakeLists.txt | grep TelegramBotApi | cut -d " " -f3) @@ -48,14 +47,35 @@ jobs: echo "Parsed version: ${TG_SERVER_VERSION}" - name: Build and push uses: docker/build-push-action@v2 - with: + with: &build-and-push-with context: . file: ./Dockerfile - platforms: linux/386,linux/amd64,linux/arm/v7,linux/arm64 + platforms: linux/386,linux/amd64 push: true cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache tags: | aiogram/telegram-bot-api:latest aiogram/telegram-bot-api:${{ env.TG_SERVER_VERSION }} - # aiogram/telegram-bot-api:${{ steps.current-time.outputs.formattedTime }} + + build-arm: + runs-on: ubuntu-latest + steps: + - *checkout + - *checkout-upstream + - name: Cache Docker layers + uses: actions/cache@v2 + with: + path: /tmp/.buildx-cache + key: ${{ runner.os }}-buildx-arm-${{ github.sha }} + - *setup-qemu + - *setup-buildx + - *login-dockerhub + - *set-version + - name: Build and push + uses: docker/build-push-action@v2 + with: + <<: *build-and-push-with + platforms: linux/arm/v7,linux/arm64 + tags: | + aiogram/telegram-bot-api:arm-${{ env.TG_SERVER_VERSION }} diff --git a/telegram-bot-api b/telegram-bot-api index 4c3478f..5c2193c 160000 --- a/telegram-bot-api +++ b/telegram-bot-api @@ -1 +1 @@ -Subproject commit 4c3478f3a375f132141bee7ab79f4d1034d0fdcf +Subproject commit 5c2193c4dcf9ca6e2de91ada8d4fdb722cb38791