[WIP] Feat/dockerize #14
Conversation
| Start the server: | ||
|
|
||
| $ shove \ | ||
| -api-addr localhost:8322 \ | ||
| -queue-redis redis://redis:6379 \ | ||
| -fcm-credentials-file /etc/shove/fcm/credentials.json \ | ||
| -apns-certificate-path /etc/shove/apns/production/bundle.pem -apns-sandbox-certificate-path /etc/shove/apns/sandbox/bundle.pem \ | ||
| -webpush-vapid-public-key=$VAPID_PUBLIC_KEY -webpush-vapid-private-key=$VAPID_PRIVATE_KEY \ | ||
| -webpush-vapid-key-file=/etc/shove/webpush/vapid-keys.json \ |
There was a problem hiding this comment.
This uses -key- whereas above it says -keys-.
| -telegram-bot-token $TELEGRAM_BOT_TOKEN | ||
|
|
||
|
|
There was a problem hiding this comment.
For readability, I would prefer to keep 2 newlines before starting a new section.
| @@ -37,7 +38,8 @@ var redisURL = flag.String("queue-redis", "", "Use Redis queue (Redis URL)") | |||
| var webhookWorkers = flag.Int("webhook-workers", 0, "The number of workers pushing Webhook messages") | |||
|
|
|||
| var webPushVAPIDPublicKey = flag.String("webpush-vapid-public-key", "", "VAPID public key") | |||
| var webPushVAPIDPrivateKey = flag.String("webpush-vapid-private-key", "", "VAPID public key") | |||
| var webPushVAPIDPrivateKey = flag.String("webpush-vapid-private-key", "", "VAPID private key") | |||
| var webPushVAPIDKeysJSON = flag.String("webpush-vapid-keys-json", "", "JSON file containing VAPID keys") | |||
There was a problem hiding this comment.
| var webPushVAPIDKeysJSON = flag.String("webpush-vapid-keys-json", "", "JSON file containing VAPID keys") | |
| var webPushVAPIDKeysFile = flag.String("webpush-vapid-keys-file", "", "JSON file containing VAPID keys") |
(that's consistent with e.g. -fcm-credentials-file)
|
|
||
| if *telegramBotToken != "" { | ||
| } else if *webPushVAPIDKeysJSON != "" { | ||
| content, err := os.ReadFile(*webPushVAPIDKeysJSON) |
There was a problem hiding this comment.
Would be good to add a check here that both webPushVAPIDPublicKey and webPushVAPIDPrivateKey are empty.
| slog.Error("Failed to unmarshal WebPush VAPID keys file, please check your JSON file containt 'publicKey' and 'privatekey' keys", "error", err) | ||
| os.Exit(1) | ||
| } | ||
| web, err := webpush.NewWebPush(vapidKeys.PublicKey, vapidKeys.PrivateKey, newServiceLogger("webpush")) |
There was a problem hiding this comment.
Don't we need to check here that after the unmarshal public key and private key are really set?
| slog.Error("Failed to add WebPush service", "error", err) | ||
| os.Exit(1) | ||
| } | ||
| } else if *telegramBotToken != "" { |
There was a problem hiding this comment.
Issue: This should be an else if -- Telegram is independent from the webpush config.
| @@ -0,0 +1,40 @@ | |||
| ARG GO_VERSION=1.23.1 | |||
There was a problem hiding this comment.
Could you split this into two separate MRs? One for docker related functionality, the other for the vapid keys file.
Hi @pennersr ,
I’m adding a Docker option, as I believe it could be useful, especially for using Docker Compose (which I use frequently).
I’m also including the option to read "vapid-keys" from a file.
The branch is still a work in progress, but I wanted to open a PR so we can discuss it.