build pr images too

This commit is contained in:
Simon Ungar Felding 2025-04-24 20:51:44 +02:00
parent 3e0cc0ff8d
commit a7fcf0fd88
2 changed files with 15 additions and 20 deletions

View File

@ -93,3 +93,13 @@ jobs:
${{ steps.repo.outputs.repo }}:${{ steps.version.outputs.version }}-build ${{ steps.repo.outputs.repo }}:${{ steps.version.outputs.version }}-build
labels: ${{ steps.docker_meta.outputs.labels }} labels: ${{ steps.docker_meta.outputs.labels }}
push: ${{ github.event_name != 'pull_request' }} push: ${{ github.event_name != 'pull_request' }}
- name: Push test-image
uses: docker/build-push-action@v2
with:
context: ./build
file: ./build/Dockerfile
platforms: ${{ env.PLATFORMS }}
tags: |
${{ steps.repo.outputs.repo }}:pr-${{ github.head_ref }}
labels: ${{ steps.docker_meta.outputs.labels }}
push: ${{ github.event_name == 'pull_request' }}

View File

@ -49,26 +49,11 @@ else
if [[ $(id -u) == 0 ]]; then if [[ $(id -u) == 0 ]]; then
socat TCP-LISTEN:25,fork TCP:127.0.0.1:1025 & socat TCP-LISTEN:25,fork TCP:127.0.0.1:1025 &
socat TCP-LISTEN:143,fork TCP:127.0.0.1:1143 & socat TCP-LISTEN:143,fork TCP:127.0.0.1:1143 &
else
socat TCP-LISTEN:2025,fork TCP:127.0.0.1:1025 &
socat TCP-LISTEN:2143,fork TCP:127.0.0.1:1143 &
fi fi
socat TCP-LISTEN:2025,fork TCP:127.0.0.1:1025 &
socat TCP-LISTEN:2143,fork TCP:127.0.0.1:1143 &
# Broken until https://github.com/ProtonMail/proton-bridge/issues/512 is resolved.
# check if the vault-editor can read the config
/protonmail/vault-editor read 2>&1 1>/dev/null
# Modify the protonmail config with env variables and expected values. Env variables must be converted from string to boolean.
/protonmail/vault-editor read | \
jq '.Settings.AutoUpdate = (env.PROTONMAIL_AutoUpdate | if . == "true" then true else false end)
| .Settings.TelemetryDisabled = (env.PROTONMAIL_TelemetryDisabled | if . == "true" then true else false end)
| .Settings.GluonDir |= "\(env.HOME)/.local/share/protonmail/bridge-v3/gluon"
| .Settings.Autostart = false
| .Settings.SMTPPort = 1025
| .Settings.IMAPPort = 1143 ' > /tmp/protonmail-conf.json
cat /tmp/protonmail-conf.json | /protonmail/vault-editor write
rm /tmp/protonmail-conf.json
# Start protonmail # Start protonmail
/protonmail/proton-bridge --noninteractive $@ /protonmail/proton-bridge --noninteractive $@