From 6d32d1a32f6d170bcddfdc97e30f765f5bd94115 Mon Sep 17 00:00:00 2001
From: Daniel Dolezal <d.dolezal97@protonmail.com>
Date: Tue, 14 Oct 2025 16:36:30 +0200
Subject: [PATCH] update build that it use the VERSION file as Argument for
 gitea action build

---
 .gitea/workflows/prod-docker-images.yml |  6 ++++++
 build/Dockerfile                        |  8 ++++----
 build/build.sh                          |  2 --
 docker-compose.yml                      | 14 ++++++++------
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/.gitea/workflows/prod-docker-images.yml b/.gitea/workflows/prod-docker-images.yml
index e04a277..3070244 100644
--- a/.gitea/workflows/prod-docker-images.yml
+++ b/.gitea/workflows/prod-docker-images.yml
@@ -22,6 +22,10 @@ jobs:
           username: ${{ secrets.DOCKER_REGISTRY_USERNAME }}
           password: ${{ secrets.ACTION_ACCESS_TOKEN }}
 
+      - name: Set version
+        id: VERSION
+        run: echo "VERSION=`cat VERSION`" >> $GITHUB_ENV
+
       - name: Build and push Docker image for latest tag
         uses: docker/build-push-action@v6
         with:
@@ -29,3 +33,5 @@ jobs:
           push: true
           tags: ${{ vars.DOCKER_REGISTRY_URL }}/daniel156161/protonmail-bridge:latest
           platforms: linux/amd64
+          build-args: |
+            version=${{ env.VERSION }}
diff --git a/build/Dockerfile b/build/Dockerfile
index c0a3fc3..b728a7a 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -1,12 +1,12 @@
 FROM golang:1.25 AS build
 
-ARG version
+ARG VERSION
 
 # Install dependencies
 RUN apt-get update && apt-get install -y build-essential libsecret-1-dev
 
 # Build
-ADD https://github.com/ProtonMail/proton-bridge.git#${version} /build/
+ADD https://github.com/ProtonMail/proton-bridge.git#${VERSION} /build/
 WORKDIR /build/
 COPY build.sh /build/
 RUN bash build.sh
@@ -26,7 +26,7 @@ RUN apt-get update \
 COPY gpgparams entrypoint.sh /protonmail/
 
 # Copy protonmail
-COPY --from=build /build/proton-bridge/bridge /protonmail/
-COPY --from=build /build/proton-bridge/proton-bridge /protonmail/
+COPY --from=build /build/bridge /protonmail/
+COPY --from=build /build/proton-bridge /protonmail/
 
 ENTRYPOINT ["bash", "/protonmail/entrypoint.sh"]
diff --git a/build/build.sh b/build/build.sh
index f411d6e..98a0341 100644
--- a/build/build.sh
+++ b/build/build.sh
@@ -2,8 +2,6 @@
 
 set -ex
 
-VERSION=`cat VERSION`
-
 # Clone new code
 sed -i 's/127.0.0.1/0.0.0.0/g' internal/constants/constants.go
 
diff --git a/docker-compose.yml b/docker-compose.yml
index fa91e7d..6461855 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,14 +1,16 @@
-version: '2.1'
-
 services:
   protonmail-bridge:
-    image: shenxn/protonmail-bridge
-    ports:
-      - 1025:25/tcp
-      - 1143:143/tcp
+    container_name: protonmail-bridge
+    image: daniel156161/protonmail-bridge
     restart: unless-stopped
+    build:
+      context: ./build
+      dockerfile: Dockerfile
+      args:
+        VERSION: v3.21.2
     volumes:
       - protonmail:/root
+
 volumes:
   protonmail:
     name: protonmail