From feb59875fd3b119163c6ad0ec870ad6ec3dc2271 Mon Sep 17 00:00:00 2001
From: Alex Root Junior <jroot.junior@gmail.com>
Date: Sun, 1 Oct 2023 16:55:11 +0300
Subject: [PATCH] Small changes in repo-structure and try to build ARM

---
 .github/workflows/docker-image.yml | 22 +++++++++++++++-------
 .gitmodules                        |  3 ---
 Dockerfile                         |  4 ++--
 Makefile                           |  6 ++----
 telegram-bot-api                   |  1 -
 5 files changed, 19 insertions(+), 17 deletions(-)
 delete mode 100644 .gitmodules
 delete mode 160000 telegram-bot-api

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index e6e1e99..86b4923 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - master
+      - rework-structure
   schedule:
     - cron: '20 4 * * *'
 
@@ -12,39 +13,46 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
+
       - name: Checkout upstream repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           repository: tdlib/telegram-bot-api
           path: telegram-bot-api
           submodules: recursive
+
       - name: Cache Docker layers
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ github.sha }}
+
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v3
+
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
+
       - name: Login to DockerHub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         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
+          platforms: linux/386,linux/amd64,linux/arm/v7,linux/arm64
           push: true
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index b26414c..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "telegram-bot-api"]
-	path = telegram-bot-api
-	url = https://github.com/tdlib/telegram-bot-api.git
diff --git a/Dockerfile b/Dockerfile
index fc68f8a..496a09b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.17.2 as build
+FROM alpine:3.18 as build
 
 ENV CXXFLAGS=""
 WORKDIR /usr/src/telegram-bot-api
@@ -11,7 +11,7 @@ RUN mkdir -p build \
  && 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"
diff --git a/Makefile b/Makefile
index 5bd786d..0f98463 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,10 @@
 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:
+	rm -rf telegram-bot-api
+	git clone --recursive https://github.com/tdlib/telegram-bot-api.git
 	docker build -t $(image_name):$(image_tag) .
 	docker tag $(image_name):$(image_tag) $(image_name):latest
 
diff --git a/telegram-bot-api b/telegram-bot-api
deleted file mode 160000
index 8180845..0000000
--- a/telegram-bot-api
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 81808454299921c142d3a6eac0cfddc97981591e