From 251863f68419eda71cf8b29ea87d5b9625646736 Mon Sep 17 00:00:00 2001 From: "Georgiy.Sitnikov@telekom.de" Date: Wed, 28 Jun 2023 09:17:36 +0200 Subject: [PATCH] Remove variables list from compose example. Add non secrets example. Move to generic variables --- docker-compose.yml | 71 +++++++++++++++++++++++----------------------- 1 file changed, 36 insertions(+), 35 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 67dc747..a42082f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,18 +1,27 @@ # start with `docker compose up` version: "3.7" -secrets: - vnc_password: - file: .secrets/vnc_password_common - epic_user: - file: .secrets/epic_user - epic_password: - file: .secrets/epic_password - epic_otp: - file: .secrets/epic_otp - services: - free-games-claimer: + free-games-claimer: # Service Example with localdata and variables + container_name: fgc # is printed in front of every output line + image: ghcr.io/vogler/free-games-claimer # otherwise image name will be free-games-claimer-free-games-claimer + ports: + # - "5900:5900" # VNC server + - "6080:6080" # noVNC (browser-based VNC client) + volumes: + - fgc:/fgc/data + # command: bash -c "node epic-games; node gog" + environment: + - VNC_PASSWORD="vnc password" + - EMAIL="user name" + - PASSWORD="password" + - EG_OTPKEY="epic otp" + +#### +# OR +#### + + free-games-claimer-secrets: # Service Example with Secrets support container_name: fgc # is printed in front of every output line image: ghcr.io/vogler/free-games-claimer # otherwise image name will be free-games-claimer-free-games-claimer ports: @@ -22,32 +31,24 @@ services: - fgc:/fgc/data # command: bash -c "node epic-games; node gog" environment: - # - EMAIL=foo@bar.org - # - NOTIFY='tgram://...' - # - NOTIFY_TITLE="Optional title for notifications" - # - VNC_PASSWORD="VNC Password" - VNC_PASSWORD_FILE=/run/secrets/vnc_password - # - BROWSER_DIR="data/browser" - # - TIMEOUT="60" - # - LOGIN_TIMEOUT="80" - # - EMAIL="Default email for any login" - # - PASSWORD="Default password for any login" - # - EG_EMAIL="Epic Games email for login" - # - EG_PASSWORD="Epic Games password for login" - # - EG_OTPKEY="Epic Games MFA OTP key" - - EG_EMAIL_FILE=/run/secrets/epic_user - - EG_PASSWORD_FILE=/run/secrets/epic_password + - EMAIL_FILE=/run/secrets/common_user + - PASSWORD_FILE=/run/secrets/common_password - EG_OTPKEY_FILE=/run/secrets/epic_otp - # - EG_PARENTALPIN="Epic Games Parental Controls PIN" - # - PG_EMAIL="Prime Gaming email for login" - # - PG_PASSWORD="Prime Gaming password for login" - # - PG_OTPKEY="Prime Gaming MFA OTP key" - # - PG_REDEEM="0" - # - PG_CLAIMDLC="0" - # - GOG_EMAIL="GOG email for login" - # - GOG_PASSWORD="GOG Password" secrets: - - epic_user - - epic_password + - user + - password - epic_otp - vnc_password + +# Secrets section is only needed if you are using docker secrets, not .env solution. +# In this case use "free-games-claimer-secrets" from the services and "free-games-claimer" otherwise. +secrets: + vnc_password: + file: .secrets/vnc_password + user: + file: .secrets/common_user + password: + file: .secrets/common_password + epic_otp: + file: .secrets/epic_otp