diff --git a/.env_template b/.env_template index 9cee8eb..8014fbb 100644 --- a/.env_template +++ b/.env_template @@ -34,12 +34,12 @@ LDAP_BIND_DN= LDAP_BIND_PASS= #MC SMP -MC_SMP_DIFFICULTY= -MC_SMP_MOTD= -MC_SMP_OPS= -MC_SMP_MAX_PLAYERS= -MC_SMP_NAME= -MC_SMP_SEED= +#MC_SMP_DIFFICULTY= +#MC_SMP_MOTD= +#MC_SMP_OPS= +#MC_SMP_MAX_PLAYERS= +#MC_SMP_NAME= +#MC_SMP_SEED= #ROMM @@ -84,15 +84,19 @@ GL_GITLAB_API_SECRET= GL_EMAIL_NAME= +#Rebble +REBBLE_SPEECH_KEY= +REBBLE_WEATHER_KEY= + #PORTS MASTODON_HTTP_PORT= MASTODON_HTTPS_PORT= -MC_NGINX_PORT= - -MC_SMP_JAVA_PORT= -MC_SMP_BEDROCK_PORT= -MC_DYNMAP_PORT= +#MC_NGINX_PORT= +# +#MC_SMP_JAVA_PORT= +#MC_SMP_BEDROCK_PORT= +#MC_DYNMAP_PORT= #CRAFTY_HTTP_PORT= #CRAFTY_HTTPS_PORT= @@ -111,3 +115,5 @@ EMUJS_PORT= GL_HTTP_PORT= GL_SSH_PORT= + +REBBLE_ASR_PORT= diff --git a/mastodon.yml b/mastodon.yml index fe8941c..c80b7ec 100644 --- a/mastodon.yml +++ b/mastodon.yml @@ -1,19 +1,27 @@ version: "3.8" +networks: + mastodonnet: + name: mastodonnet + services: mastodon-redis: # data structure server for mastodon https://redis.io/docs/about/ image: redis container_name: mastodon-redis - network_mode: mastodonnet +# network_mode: mastodonnet + networks: + - mastodonnet volumes: - - ${DATA_PATH}/mastodon/redis:/data' + - ${DATA_PATH}/mastodon/redis:/data restart: unless-stopped mastodon-db: # database for mastodon https://hub.docker.com/_/postgres image: postgres:15.2 container_name: mastodon-db - network_mode: mastodonnet +# network_mode: mastodonnet + networks: + - mastodonnet environment: - POSTGRES_USER=${MASTODON_DB_USER} - POSTGRES_PASSWORD=${MASTODON_DB_PASS} @@ -24,7 +32,9 @@ services: mastodon-elasticsearch: # search and analytics engine for mastodon https://hub.docker.com/_/elasticsearch image: elasticsearch:8.8.0 container_name: mastodon-elasticsearch - network_mode: mastodonnet +# network_mode: mastodonnet + networks: + - mastodonnet environment: - discovery.type=single-node - xpack.ml.enabled=false @@ -34,7 +44,9 @@ services: mastodon: # activitypub microbloggin social network https://docs.linuxserver.io/images/docker-mastodon/#version-tags image: lscr.io/linuxserver/mastodon:latest container_name: mastodon - network_mode: mastodonnet +# network_mode: mastodonnet + networks: + - mastodonnet environment: - PUID=${UID} - PGID=${GID} diff --git a/minecraft.yml b/minecraft.yml deleted file mode 100644 index 8dd5638..0000000 --- a/minecraft.yml +++ /dev/null @@ -1,51 +0,0 @@ -version: "3.8" - -services: - - mc-nginx: # I use this to host a webpage at my minecraft ip - image: nginx - container_name: mc-nginx - volumes: - - ${DATA_PATH}/mc-nginx/src:/usr/share/nginx/html - ports: - - ${MC_NGINX_PORT}:80 - restart: unless-stopped - - mc-smp: # minecraft paper server. The config here and options in .env will get you a working server, but you might want to customize it further https://docker-minecraft-server.readthedocs.io/ - image: itzg/minecraft-server - container_name: mc-smp - ports: - - ${MC_SMP_JAVA_PORT}:25565/tcp - - ${MC_SMP_JAVA_PORT}:25565/udp - - ${MC_SMP_BEDROCK_PORT}:19132/tcp - - ${MC_SMP_BEDROCK_PORT}:19132/udp - - ${MC_DYNMAP_PORT}:8123 - environment: - - EULA=TRUE - - UID=${UID} - - GID=${GID} - - EXEC_DIRECTLY=TRUE - - MEMORY=4G - - VERSION=LATEST - - TYPE=PAPER - - SPIGET_RESOURCES=18494 - - MODS_FILE=/extras/mods.txt - - DIFFICULTY=${MC_SMP_DIFFICULTY} - - MOTD=${MC_SMP_MOTD} - - OPS=${MC_SMP_OPS} - - ICON=/extras/server-icon.png - - MAX_PLAYERS=${MC_SMP_MAX_PLAYERS} - - ALLOW_NETHER=TRUE - - ANNOUNCE_PLAYER_ACHIEVEMENTS=TRUE - - GENERATE_STRUCTURES=TRUE - - MODE=survival - - SERVER_NAME=${MC_SMP_NAME} - - ENABLE_ROLLING_LOGS=TRUE - - TZ=${TZ} - - SEED=${MC_SMP_SEED} - tty: true - stdin_open: true - volumes: - - ${DATA_PATH}/mc-smp/data:/data - - ${DATA_PATH}/mc-smp/extras:/extras - restart: unless-stopped diff --git a/rebble.yml b/rebble.yml new file mode 100644 index 0000000..b1429c4 --- /dev/null +++ b/rebble.yml @@ -0,0 +1,22 @@ +version: "3.8" + +services: + + rebble-asr-pogmom: + image: rebble-asr-pogmom + container_name: rebble-asr-pogmom + ports: + - "732:443" + environment: + - SPEECH_API_KEY=${REBBLE_SPEECH_KEY} + restart: always + + rebble-weather-pogmom: + image: rebble-weather-pogmom + container_name: rebble-weather-pogmom + ports: + - "733:5000" + environment: + - IBM_API_KEY=${REBBLE_WEATHER_KEY} + - FLASK_APP=weather + restart: always