Merge pull request #12 from aiogram/rework-structure

Reworked project structure and added multi-arch build

.github/workflows/docker-image.yml

@@ -1,53 +0,0 @@
-name: Docker Image
-
-on:
-  push:
-    branches:
-      - master
-  schedule:
-    - cron: '20 4 * * *'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Checkout upstream repo
-        uses: actions/checkout@v2
-        with:
-          repository: tdlib/telegram-bot-api
-          path: telegram-bot-api
-          submodules: recursive
-      - name: Cache Docker layers
-        uses: actions/cache@v2
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_LOGIN }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Set version
-        id: current-version
-        run: |
-          TG_SERVER_VERSION=$(cat telegram-bot-api/CMakeLists.txt | grep TelegramBotApi | cut -d " " -f3)
-          echo "TG_SERVER_VERSION=${TG_SERVER_VERSION}" >> $GITHUB_ENV
-          echo "Parsed version: ${TG_SERVER_VERSION}"
-      - name: Build and push
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          file: ./Dockerfile
-          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 }}

.github/workflows/multiarch.yml

@@ -0,0 +1,249 @@
+# Based on https://github.com/tdlight-team/tdlight-telegram-bot-api/blob/8990b79e9eac85c6107922283f25385b5e8c027a/.github/workflows/docker.yml#L1
+
+name: Docker multi-arch build and push
+
+on:
+  push:
+    branches:
+      - main
+      - master
+  #      - rework-structure
+  #  pull_request:
+  schedule:
+    - cron: '20 4 * * *'
+
+jobs:
+  build:
+    name: Build Docker image (${{ matrix.arch }})
+    runs-on: ubuntu-latest
+    env:
+      IMAGE_TAG: ghcr.io/${{ github.repository_owner }}/telegram-bot-api
+      IMAGE_TAG_DH: ${{ secrets.DOCKERHUB_OWNER }}/telegram-bot-api
+    strategy:
+      matrix:
+        arch:
+          - linux/386
+          - linux/amd64
+          - linux/arm/v6
+          - linux/arm/v7
+          - linux/arm64
+          - linux/ppc64le
+
+    steps:
+      - name: Checkout current repo
+        uses: actions/checkout@v4
+
+      - name: Checkout upstream repo
+        uses: actions/checkout@v4
+        with:
+          repository: tdlib/telegram-bot-api
+          path: telegram-bot-api
+          submodules: recursive
+
+      - name: Get version
+        run: |
+          # Get latest commit short hash
+          HASH_VERSION=$(git rev-parse --short HEAD)
+          
+          # Get real version from the code
+          VERSION=$(cat telegram-bot-api/CMakeLists.txt | grep TelegramBotApi | cut -d " " -f3)
+
+          # Use Docker `latest` tag convention
+          # [ "$VERSION" == "master" ] && VERSION=latest
+
+          # Convert IMAGE_TAG, HASH_VERSION and VERSION to lowercase (repository name must be lowercase)
+          IMAGE_TAG=$(echo "$IMAGE_TAG" | awk '{print tolower($0)}')
+          IMAGE_TAG_DH=$(echo "$IMAGE_TAG_DH" | awk '{print tolower($0)}')
+          HASH_VERSION=$(echo "$HASH_VERSION" | awk '{print tolower($0)}')
+          VERSION=$(echo "$VERSION" | awk '{print tolower($0)}')
+          ARCH=${{ matrix.arch }}
+          SAFE_ARCH=${ARCH///}  # linux/amd64 -> linuxamd64
+
+          # Store variable for future use
+          echo "IMAGE_TAG=$IMAGE_TAG" >> $GITHUB_ENV
+          echo "IMAGE_TAG_DH=$IMAGE_TAG_DH" >> $GITHUB_ENV
+          echo "HASH_VERSION=$HASH_VERSION" >> $GITHUB_ENV
+          echo "VERSION=$VERSION" >> $GITHUB_ENV
+          echo "SAFE_ARCH=$SAFE_ARCH" >> $GITHUB_ENV
+
+          # Print debug info
+          echo "hash version: $HASH_VERSION"
+          echo "version: $VERSION"
+          echo "safe arch: $SAFE_ARCH"
+
+          # Save env to file
+          cat $GITHUB_ENV > github.env
+
+      - name: Upload environment info as artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: github_env
+          path: github.env
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Cache Docker layers
+        uses: actions/cache@v3
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ env.SAFE_ARCH }}-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-${{ env.SAFE_ARCH }}-
+
+      - name: Login to ghcr registry
+        uses: docker/login-action@v2
+        if: ${{ github.event_name != 'pull_request' }}
+        with:
+          registry: ghcr.io
+          username: ${{ secrets.GH_USERNAME }}
+          password: ${{ secrets.GH_ACCESS_TOKEN }}
+
+      - name: Login to Docker Hub registry
+        uses: docker/login-action@v2
+        if: ${{ github.event_name != 'pull_request' }}
+        with:
+          username: ${{ secrets.DOCKERHUB_LOGIN }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build image
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./Dockerfile
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,mode=max,dest=/tmp/.buildx-cache
+          platforms: ${{ matrix.arch }}
+          push: false
+          load: true
+          tags: |
+            tdlightbotapi:${{ env.HASH_VERSION }}-${{ env.SAFE_ARCH }}
+
+      - name: Tag and push image
+        if: ${{ github.event_name != 'pull_request' }}
+        run: |
+          docker tag tdlightbotapi:${{ env.HASH_VERSION }}-${{ env.SAFE_ARCH }} ${{ env.IMAGE_TAG }}:${{ env.HASH_VERSION }}-${{ env.SAFE_ARCH }}
+          docker tag tdlightbotapi:${{ env.HASH_VERSION }}-${{ env.SAFE_ARCH }} ${{ env.IMAGE_TAG }}:${{ env.VERSION }}-${{ env.SAFE_ARCH }}
+          docker tag tdlightbotapi:${{ env.HASH_VERSION }}-${{ env.SAFE_ARCH }} ${{ env.IMAGE_TAG_DH }}:${{ env.HASH_VERSION }}-${{ env.SAFE_ARCH }}
+          docker tag tdlightbotapi:${{ env.HASH_VERSION }}-${{ env.SAFE_ARCH }} ${{ env.IMAGE_TAG_DH }}:${{ env.VERSION }}-${{ env.SAFE_ARCH }}
+          docker push ${{ env.IMAGE_TAG}}:${{ env.HASH_VERSION}}-${{ env.SAFE_ARCH }}
+          docker push ${{ env.IMAGE_TAG }}:${{ env.VERSION }}-${{ env.SAFE_ARCH }}
+          docker push ${{ env.IMAGE_TAG_DH }}:${{ env.HASH_VERSION }}-${{ env.SAFE_ARCH }}
+          docker push ${{ env.IMAGE_TAG_DH }}:${{ env.VERSION }}-${{ env.SAFE_ARCH }}
+
+      - name: Save image as tar archive
+        if: ${{ github.event_name != 'pull_request' }}
+        run: |
+          docker save ${{ env.IMAGE_TAG }}:${{ env.HASH_VERSION }}-${{ env.SAFE_ARCH }} -o ${{ env.SAFE_ARCH }}.tar
+
+      - name: Save image as tar archive (pull request)
+        if: ${{ github.event_name == 'pull_request' }}
+        run: |
+          docker save tdlightbotapi:${{ env.HASH_VERSION }}-${{ env.SAFE_ARCH }} -o ${{ env.SAFE_ARCH }}.tar
+
+      - name: Upload image as artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: image_${{ env.SAFE_ARCH }}
+          path: ${{ env.SAFE_ARCH }}.tar
+
+  push-manifest:
+    name: Create and push multi-arch Docker manifest
+    runs-on: ubuntu-latest
+    if: ${{ github.event_name != 'pull_request' }}
+    env:
+      DOCKER_CLI_EXPERIMENTAL: enabled
+    needs: build
+
+    steps:
+      - name: Download artifacts
+        uses: actions/download-artifact@v2
+
+      - name: Load environment info and built images
+        run: |
+          cat github_env/github.env > $GITHUB_ENV
+          docker load --input image_linux386/linux386.tar
+          docker load --input image_linuxamd64/linuxamd64.tar
+          docker load --input image_linuxarmv6/linuxarmv6.tar
+          docker load --input image_linuxarmv7/linuxarmv7.tar
+          docker load --input image_linuxarm64/linuxarm64.tar
+          docker load --input image_linuxppc64le/linuxppc64le.tar
+
+      - name: Login to ghcr registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Login to Docker Hub registry
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_LOGIN }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Create and push manifest
+        run: |
+          # -- Push to ghcr.io
+          docker manifest create ${{ env.IMAGE_TAG }}:${{ env.HASH_VERSION }} \
+          --amend ${{ env.IMAGE_TAG }}:${{ env.HASH_VERSION }}-linux386 \
+          --amend ${{ env.IMAGE_TAG }}:${{ env.HASH_VERSION }}-linuxamd64 \
+          --amend ${{ env.IMAGE_TAG }}:${{ env.HASH_VERSION }}-linuxarmv6 \
+          --amend ${{ env.IMAGE_TAG }}:${{ env.HASH_VERSION }}-linuxarmv7 \
+          --amend ${{ env.IMAGE_TAG }}:${{ env.HASH_VERSION }}-linuxarm64 \
+          --amend ${{ env.IMAGE_TAG }}:${{ env.HASH_VERSION }}-linuxppc64le
+          #docker manifest push ${{ env.IMAGE_TAG }}:${{ env.HASH_VERSION }}
+
+          # Tag images as VERSION (like 'latest')
+          docker tag ${{ env.IMAGE_TAG }}:${{ env.HASH_VERSION }}-linux386 ${{ env.IMAGE_TAG }}:${{ env.VERSION }}-linux386
+          docker tag ${{ env.IMAGE_TAG }}:${{ env.HASH_VERSION }}-linuxamd64 ${{ env.IMAGE_TAG }}:${{ env.VERSION }}-linuxamd64
+          docker tag ${{ env.IMAGE_TAG }}:${{ env.HASH_VERSION }}-linuxarmv6 ${{ env.IMAGE_TAG }}:${{ env.VERSION }}-linuxarmv6
+          docker tag ${{ env.IMAGE_TAG }}:${{ env.HASH_VERSION }}-linuxarmv7 ${{ env.IMAGE_TAG }}:${{ env.VERSION }}-linuxarmv7
+          docker tag ${{ env.IMAGE_TAG }}:${{ env.HASH_VERSION }}-linuxarm64 ${{ env.IMAGE_TAG }}:${{ env.VERSION }}-linuxarm64
+          docker tag ${{ env.IMAGE_TAG }}:${{ env.HASH_VERSION }}-linuxppc64le ${{ env.IMAGE_TAG }}:${{ env.VERSION }}-linuxppc64le
+
+          docker manifest create ${{ env.IMAGE_TAG }}:${{ env.VERSION }} \
+          --amend ${{ env.IMAGE_TAG }}:${{ env.VERSION }}-linux386 \
+          --amend ${{ env.IMAGE_TAG }}:${{ env.VERSION }}-linuxamd64 \
+          --amend ${{ env.IMAGE_TAG }}:${{ env.VERSION }}-linuxarmv6 \
+          --amend ${{ env.IMAGE_TAG }}:${{ env.VERSION }}-linuxarmv7 \
+          --amend ${{ env.IMAGE_TAG }}:${{ env.VERSION }}-linuxarm64 \
+          --amend ${{ env.IMAGE_TAG }}:${{ env.VERSION }}-linuxppc64le
+          #docker manifest push ${{ env.IMAGE_TAG }}:${{ env.VERSION }}
+
+          # -- Push to Docker Hub
+          docker tag ${{ env.IMAGE_TAG }}:${{ env.HASH_VERSION }}-linux386 ${{ env.IMAGE_TAG_DH }}:${{ env.VERSION }}-linux386
+          docker tag ${{ env.IMAGE_TAG }}:${{ env.HASH_VERSION }}-linuxamd64 ${{ env.IMAGE_TAG_DH }}:${{ env.VERSION }}-linuxamd64
+          docker tag ${{ env.IMAGE_TAG }}:${{ env.HASH_VERSION }}-linuxarmv6 ${{ env.IMAGE_TAG_DH }}:${{ env.VERSION }}-linuxarmv6
+          docker tag ${{ env.IMAGE_TAG }}:${{ env.HASH_VERSION }}-linuxarmv7 ${{ env.IMAGE_TAG_DH }}:${{ env.VERSION }}-linuxarmv7
+          docker tag ${{ env.IMAGE_TAG }}:${{ env.HASH_VERSION }}-linuxarm64 ${{ env.IMAGE_TAG_DH }}:${{ env.VERSION }}-linuxarm64
+          docker tag ${{ env.IMAGE_TAG }}:${{ env.HASH_VERSION }}-linuxppc64le ${{ env.IMAGE_TAG_DH }}:${{ env.VERSION }}-linuxppc64le
+
+          docker manifest create ${{ env.IMAGE_TAG_DH }}:${{ env.HASH_VERSION }} \
+          --amend ${{ env.IMAGE_TAG_DH }}:${{ env.HASH_VERSION }}-linux386 \
+          --amend ${{ env.IMAGE_TAG_DH }}:${{ env.HASH_VERSION }}-linuxamd64 \
+          --amend ${{ env.IMAGE_TAG_DH }}:${{ env.HASH_VERSION }}-linuxarmv6 \
+          --amend ${{ env.IMAGE_TAG_DH }}:${{ env.HASH_VERSION }}-linuxarmv7 \
+          --amend ${{ env.IMAGE_TAG_DH }}:${{ env.HASH_VERSION }}-linuxarm64 \
+          --amend ${{ env.IMAGE_TAG_DH }}:${{ env.HASH_VERSION }}-linuxppc64le
+          docker manifest push ${{ env.IMAGE_TAG_DH }}:${{ env.HASH_VERSION }}
+
+          # Tag images as VERSION (like 'latest')
+          docker tag ${{ env.IMAGE_TAG }}:${{ env.HASH_VERSION }}-linux386 ${{ env.IMAGE_TAG_DH }}:${{ env.VERSION }}-linux386
+          docker tag ${{ env.IMAGE_TAG }}:${{ env.HASH_VERSION }}-linuxamd64 ${{ env.IMAGE_TAG_DH }}:${{ env.VERSION }}-linuxamd64
+          docker tag ${{ env.IMAGE_TAG }}:${{ env.HASH_VERSION }}-linuxarmv6 ${{ env.IMAGE_TAG_DH }}:${{ env.VERSION }}-linuxarmv6
+          docker tag ${{ env.IMAGE_TAG }}:${{ env.HASH_VERSION }}-linuxarmv7 ${{ env.IMAGE_TAG_DH }}:${{ env.VERSION }}-linuxarmv7
+          docker tag ${{ env.IMAGE_TAG }}:${{ env.HASH_VERSION }}-linuxarm64 ${{ env.IMAGE_TAG_DH }}:${{ env.VERSION }}-linuxarm64
+          docker tag ${{ env.IMAGE_TAG }}:${{ env.HASH_VERSION }}-linuxppc64le ${{ env.IMAGE_TAG_DH }}:${{ env.VERSION }}-linuxppc64le
+
+          docker manifest create ${{ env.IMAGE_TAG_DH }}:${{ env.VERSION }} \
+          --amend ${{ env.IMAGE_TAG_DH }}:${{ env.VERSION }}-linux386 \
+          --amend ${{ env.IMAGE_TAG_DH }}:${{ env.VERSION }}-linuxamd64 \
+          --amend ${{ env.IMAGE_TAG_DH }}:${{ env.VERSION }}-linuxarmv6 \
+          --amend ${{ env.IMAGE_TAG_DH }}:${{ env.VERSION }}-linuxarmv7 \
+          --amend ${{ env.IMAGE_TAG_DH }}:${{ env.VERSION }}-linuxarm64 \
+          --amend ${{ env.IMAGE_TAG_DH }}:${{ env.VERSION }}-linuxppc64le
+          docker manifest push ${{ env.IMAGE_TAG_DH }}:${{ env.VERSION }}

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "telegram-bot-api"]
-	path = telegram-bot-api
-	url = https://github.com/tdlib/telegram-bot-api.git

Dockerfile

@@ -1,17 +1,18 @@
-FROM alpine:3.17.2 as build
+FROM alpine:3.18 as build
 
 ENV CXXFLAGS=""
 WORKDIR /usr/src/telegram-bot-api
 
 RUN apk add --no-cache --update alpine-sdk linux-headers git zlib-dev openssl-dev gperf cmake
 COPY telegram-bot-api /usr/src/telegram-bot-api
+ARG nproc=1
 RUN mkdir -p build \
  && cd build \
  && cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX:PATH=.. .. \
- && cmake --build . --target install -j $(nproc) \
+ && cmake --build . --target install -j ${nproc} \
  && strip /usr/src/telegram-bot-api/bin/telegram-bot-api
 
-FROM alpine:3.17.2
+FROM alpine:3.18
 
 ENV TELEGRAM_WORK_DIR="/var/lib/telegram-bot-api" \
     TELEGRAM_TEMP_DIR="/tmp/telegram-bot-api"

Makefile

@@ -1,13 +1,11 @@
 image_name := aiogram/telegram-bot-api
 image_tag := $(shell date +%Y%m%d)
 
-.PHONY: update
-update:
-	git submodule -q foreach git pull -q origin master
-
 .PHONY: build
 build:
-	docker build -t $(image_name):$(image_tag) .
+	rm -rf telegram-bot-api
+	git clone --recursive https://github.com/tdlib/telegram-bot-api.git
+	docker build -t $(image_name):$(image_tag) --build-arg nproc=$(shell nproc) .
 	docker tag $(image_name):$(image_tag) $(image_name):latest
 
 .PHONY: publish

telegram-bot-api

@@ -1 +0,0 @@
-Subproject commit 81808454299921c142d3a6eac0cfddc97981591e