Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix meeseeks #239

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix meeseeks #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a889c4
meeseeks: Use services and env_file in docker-compose.yml
Artem4590 May 11, 2023
d310234
meeseeks: Remove unnecessary environment variables
Artem4590 May 11, 2023
4240b26
meeseeks: Add XML_CALENDAR_HOST enviroment variable
Artem4590 May 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 12 additions & 57 deletions meeseeks/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,58 +1,13 @@
db:
image: postgres:13
restart: always
environment:
- POSTGRES_USER=${PG_USER}
- POSTGRES_DB=${PG_NAME}
- POSTGRES_PASSWORD=${PG_PASSWORD}
- PGHOST=${PG_HOST}
- PGPORT=${PG_PORT}
volumes:
- ./volumes/_db:/var/lib/postgresql/data
net: host
version: "3.3"
services:
db:
image: postgres:13
env_file: .env
network_mode: host
volumes:
- ./volumes/_db:/var/lib/postgresql/data

meeseeks:
image: meeseeks:${TAG}
restart: always
net: host
environment:
# ----- Meeseeks
- ALIAS=${ALIAS}
- COMPANY_NAME=${COMPANY_NAME}
- CONNECT_ATTEMPTS=${CONNECT_ATTEMPTS}
- HELLO_RESPONSE=${HELLO_RESPONSE}
- ROCKET_CHAT_API=${ROCKET_CHAT_API}
- PASSWORD=${PASSWORD}
- USER_NAME=${USER_NAME}
- TIME_ZONE=${TIME_ZONE}
# ----- Postgres
- PG_HOST=${PG_HOST}
- PG_NAME=${PG_NAME}
- PG_PASSWORD=${PG_PASSWORD}
- PG_PORT=${PG_PORT}
- PG_USER=${PG_USER}
# ----- HappyBirthder
- BIRTHDAY_CHANNEL_TTL=${BIRTHDAY_CHANNEL_TTL}
- BIRTHDAY_LOGGING_CHANNEL=${BIRTHDAY_LOGGING_CHANNEL}
- CHECK_USERS_AVATARS=${CHECK_USERS_AVATARS}
- CREATE_BIRTHDAY_CHANNELS=${CREATE_BIRTHDAY_CHANNELS}
- GREETINGS_RESPONSE=${GREETINGS_RESPONSE}
- HB_CRONTAB=${HB_CRONTAB}
- NOTIFY_SET_AVATAR=${NOTIFY_SET_AVATAR}
- NOTIFY_SET_BIRTH_DATE=${NOTIFY_SET_BIRTH_DATE}
- NUMBER_OF_DAYS_IN_ADVANCE=${NUMBER_OF_DAYS_IN_ADVANCE}
- PERSONS_WITHOUT_BIRTHDAY_RESPONSE=${PERSONS_WITHOUT_BIRTHDAY_RESPONSE}
- SET_BIRTHDAY_RESPONSE=${SET_BIRTHDAY_RESPONSE}
# ----- TenorAPI
- CONGRATULATION_PHRASES=${CONGRATULATION_PHRASES}
- TENOR_API_KEY=${TENOR_API_KEY}
- TENOR_API_URL=${TENOR_API_URL}
- TENOR_IMAGE_LIMIT=${TENOR_IMAGE_LIMIT}
- TENOR_SEARCH_TERM=${TENOR_SEARCH_TERM}
- TENOR_BLACKLISTED_GIF_IDS=${TENOR_BLACKLISTED_GIF_IDS}
# ----- VoteOrDie
- RESPOND_TO_DM=${RESPOND_TO_DM}
# ----- Holidays
- CUSTOM_HOLIDAYS=${CUSTOM_HOLIDAYS}
- HOLIDAYS_CRONTAB_WEEK_BEFORE=${HOLIDAYS_CRONTAB_WEEK_BEFORE}
- HOLIDAYS_CRONTAB_DAY_BEFORE=${HOLIDAYS_CRONTAB_DAY_BEFORE}
meeseeks:
image: meeseeks:${TAG}
env_file: .env
network_mode: host
23 changes: 2 additions & 21 deletions meeseeks/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,14 @@ set -x

export ALIAS="${ALIAS:=""}"

export COMPANY_NAME="${COMPANY_NAME:=""}"

export CONNECT_ATTEMPTS="${CONNECT_ATTEMPTS:="5"}"

export HELLO_RESPONSE="${HELLO_RESPONSE:="Hello my friend"}"

export ROCKET_CHAT_API="${ROCKET_CHAT_API}"

export PASSWORD="${PASSWORD}"

export USER_NAME="${USER_NAME}"

export TIME_ZONE="${TIME_ZONE:="Europe/Moscow"}"

export PG_HOST="${PG_HOST:="127.0.0.1"}"

export PG_NAME="${PG_NAME:="postgres"}"
Expand All @@ -36,25 +30,10 @@ export CHECK_USERS_AVATARS="${CHECK_USERS_AVATARS:=""}"

export CREATE_BIRTHDAY_CHANNELS="${CREATE_BIRTHDAY_CHANNELS:=""}"

export COMPANY_NAME="${COMPANY_NAME:="CusDeb Solutions"}"

export GREETINGS_RESPONSE="${GREETINGS_RESPONSE:="Welcome to ${COMPANY_NAME}!"}"

export HB_CRONTAB="${HB_CRONTAB:="0 0 7 * * *"}"

export NOTIFY_SET_AVATAR="${NOTIFY_SET_AVATAR:="Oh, I see you didn't set avatar!
Please, do it as soon as possible. :grin:"}"

export NOTIFY_SET_BIRTH_DATE="${NOTIFY_SET_BIRTH_DATE:="Hmm…\nIt looks like you forgot to set the date of birth.\nPlease enter it (DD.MM.YYYY)."}"

export NUMBER_OF_DAYS_IN_ADVANCE="${NUMBER_OF_DAYS_IN_ADVANCE:="7"}"

export PERSONS_WITHOUT_BIRTHDAY_RESPONSE="${PERSONS_WITHOUT_BIRTHDAY_RESPONSE:="These persons did not provide date of birth."}"

export SET_BIRTHDAY_RESPONSE="${SET_BIRTHDAY_RESPONSE:="I memorized you birthday, well done! :wink:"}"

export CONGRATULATION_PHRASES="${CONGRATULATION_PHRASES:=""}"

export TENOR_API_KEY="${TENOR_API_KEY}"

export TENOR_API_URL="${TENOR_API_URL:="https://api.tenor.com/v1/"}"
Expand All @@ -73,6 +52,8 @@ export HOLIDAYS_CRONTAB_WEEK_BEFORE="${HOLIDAYS_CRONTAB_WEEK_BEFORE:="0 0 7 * *

export HOLIDAYS_CRONTAB_DAY_BEFORE="${HOLIDAYS_CRONTAB_DAY_BEFORE:="0 0 18 * * *"}"

export XML_CALENDAR_HOST="${XML_CALENDAR_HOST:="http://xmlcalendar.ru"}"

set +x

ln -snf /usr/share/zoneinfo/"${TIME_ZONE}" /etc/localtime
Expand Down
Loading