Skip to content

Commit

Permalink
update compose configs, envs
Browse files Browse the repository at this point in the history
  • Loading branch information
nning committed Aug 27, 2024
1 parent eed7fef commit f3bfd7a
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 19 deletions.
5 changes: 1 addition & 4 deletions deploy/.env
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
MYSQL_ROOT_PASSWD=foo
RAILS_MASTER_KEY=273e7d84098ff0e09b20c306c5fb2ba6%
SECRET_KEY_BASE=81a50ce4ee39089060a855889147fa6bba8ca84be1d5093c80da7d55960f90c945784e75176541df33efa1dd368ce5e83653dfadb96c8c5c319ee46cc352e17c
GITHUB_KEY=130d0c6d1cf10012eb97
GITHUB_SECRET=57ca9eabd8378bda0c256d6af1b1849a8669ba7a
RAILS_MASTER_KEY=273e7d84098ff0e09b20c306c5fb2ba6
3 changes: 0 additions & 3 deletions deploy/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,6 @@ services:
RAILS_FORCE_SSL: "false"
RAILS_SERVE_STATIC_FILES: "true"
RAILS_MASTER_KEY: $RAILS_MASTER_KEY
SECRET_KEY_BASE: $SECRET_KEY_BASE
GITHUB_KEY: $GITHUB_KEY
GITHUB_SECRET: $GITHUB_SECRET
restart: always

sidekiq:
Expand Down
4 changes: 1 addition & 3 deletions examples/traefik/.env
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
MYSQL_ROOT_PASSWD=thaefaegai9phieshapai3aiPoh7iesh
SECRET_KEY_BASE=b1ea590ebe609d4894356616d0348cbd81a6fd490887e5850e78f8514970e47a19b661acaa8faa4f59f8cb274271b55f8934ed1b3bda75e91e5a722ddd3f3790
GITHUB_KEY=08516d70b930551a7545
GITHUB_SECRET=ee9b04479d7910b978b0e7bbfc0e6f35a0cd3d51
RAILS_MASTER_KEY=
15 changes: 6 additions & 9 deletions examples/traefik/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
# Search for "example.com" and replace E-Mail addresses and domain names
# WARNING: Configure secret keys in .env for production setups!

version: '3'

services:
traefik:
image: traefik:v2.9
image: traefik:v3.1
container_name: traefik
command:
# - --log.level=DEBUG
Expand Down Expand Up @@ -35,7 +33,7 @@ services:
image: mariadb:10
container_name: db
environment:
MYSQL_ROOT_PASSWORD: '$MYSQL_ROOT_PASSWD'
MYSQL_ROOT_PASSWORD: $MYSQL_ROOT_PASSWD
volumes:
- db:/var/lib/mysql
restart: unless-stopped
Expand All @@ -53,18 +51,17 @@ services:
- redis
volumes:
- ./settings.yml:/app/config/settings/production.yml
- ./credentials.yml.enc:/app/config/credentials/production.yml
- ./storage:/app/storage
environment:
DATABASE_URL: mysql2://root:$MYSQL_ROOT_PASSWD@db:3306/imgshr?encoding=utf8&pool=4&timeout=5000
REDIS_PROVIDER: REDIS_URL
REDIS_URL: redis://redis:6379
RAILS_ENV: production
RAILS_SERVE_STATIC_FILES: 'true'
RAILS_LOG_TO_STDOUT: 'true'
RAILS_SERVE_STATIC_FILES: "true"
RAILS_LOG_TO_STDOUT: "true"
RAILS_MAX_THREADS: 4
SECRET_KEY_BASE: $SECRET_KEY_BASE
GITHUB_KEY: $GITHUB_KEY
GITHUB_SECRET: $GITHUB_SECRET
RAILS_MASTER_KEY: $RAILS_MASTER_KEY
labels:
- traefik.enable=true

Expand Down

0 comments on commit f3bfd7a

Please sign in to comment.