Docker/protonmail-bridge
1
0
Fork 0
Code Issues Actions 1 Packages Activity

update build that it use the VERSION file as Argument for gitea action build
Build and Push Docker Container / build-and-push (push) Has started running
Details

Browse Source
This commit is contained in:
Daniel Dolezal
2025-10-14 16:36:30 +02:00
parent 1428582834
commit 6d32d1a32f
4 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitea/workflows/prod-docker-images.yml
+6
View File
@@ -22,6 +22,10 @@ jobs:
username: ${{ secrets.DOCKER_REGISTRY_USERNAME }} username: ${{ secrets.DOCKER_REGISTRY_USERNAME }}
password: ${{ secrets.ACTION_ACCESS_TOKEN }} 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 - name: Build and push Docker image for latest tag
uses: docker/build-push-action@v6 uses: docker/build-push-action@v6
with: with:
@@ -29,3 +33,5 @@ jobs:
push: true push: true
tags: ${{ vars.DOCKER_REGISTRY_URL }}/daniel156161/protonmail-bridge:latest tags: ${{ vars.DOCKER_REGISTRY_URL }}/daniel156161/protonmail-bridge:latest
platforms: linux/amd64 platforms: linux/amd64
build-args: |
version=${{ env.VERSION }}
build/Dockerfile
+4 -4
View File
@@ -1,12 +1,12 @@
FROM golang:1.25 AS build FROM golang:1.25 AS build
ARG version ARG VERSION
# Install dependencies # Install dependencies
RUN apt-get update && apt-get install -y build-essential libsecret-1-dev RUN apt-get update && apt-get install -y build-essential libsecret-1-dev
# Build # Build
ADD https://github.com/ProtonMail/proton-bridge.git#${version} /build/ ADD https://github.com/ProtonMail/proton-bridge.git#${VERSION} /build/
WORKDIR /build/ WORKDIR /build/
COPY build.sh /build/ COPY build.sh /build/
RUN bash build.sh RUN bash build.sh
@@ -26,7 +26,7 @@ RUN apt-get update \
COPY gpgparams entrypoint.sh /protonmail/ COPY gpgparams entrypoint.sh /protonmail/
# Copy protonmail # Copy protonmail
COPY --from=build /build/proton-bridge/bridge /protonmail/ COPY --from=build /build/bridge /protonmail/
COPY --from=build /build/proton-bridge/proton-bridge /protonmail/ COPY --from=build /build/proton-bridge /protonmail/
ENTRYPOINT ["bash", "/protonmail/entrypoint.sh"] ENTRYPOINT ["bash", "/protonmail/entrypoint.sh"]
build/build.sh
-2
View File
@@ -2,8 +2,6 @@
set -ex set -ex
VERSION=`cat VERSION`
# Clone new code # Clone new code
sed -i 's/127.0.0.1/0.0.0.0/g' internal/constants/constants.go sed -i 's/127.0.0.1/0.0.0.0/g' internal/constants/constants.go
docker-compose.yml
+8 -6
View File
@@ -1,14 +1,16 @@
version: '2.1'
services: services:
protonmail-bridge: protonmail-bridge:
image: shenxn/protonmail-bridge container_name: protonmail-bridge
ports: image: daniel156161/protonmail-bridge
- 1025:25/tcp
- 1143:143/tcp
restart: unless-stopped restart: unless-stopped
build:
context: ./build
dockerfile: Dockerfile
args:
VERSION: v3.21.2
volumes: volumes:
- protonmail:/root - protonmail:/root
volumes: volumes:
protonmail: protonmail:
name: protonmail name: protonmail