Skip to content

Commit

Permalink
chore(docker): update comments
Browse files Browse the repository at this point in the history
  • Loading branch information
marcelgerber committed Feb 17, 2025
1 parent 373f7bf commit 7a706eb
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 15 deletions.
7 changes: 1 addition & 6 deletions docker-compose.dbtests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,18 @@ services:
MYSQL_ROOT_PASSWORD: weeniest-stretch-contaminate-gnarl
MYSQL_ROOT_HOST: "%"

# mysql:8.0 container with slight augmentation (+curl, +unzip, +ssh client, ...) for running the DB init scripts
# These init scripts check if the grapher database and users are missing, if so they create them
# and pull the data to have a working dev environment.
# mysql:8 container for running the DB creation scripts
db-load-data:
image: mysql:8
command: "/app/create-test-db.sh"
volumes:
- ./devTools/docker:/app
- ./db/migration:/migration
- ./tmp-downloads:/tmp-downloads
# - ~/.ssh:/user/.ssh # map the .ssh directory into the container so it knows about the owid-live ssh configuration
# - ${SSH_AUTH_SOCK}:/ssh-agent # Forward the SSH agent socket into the container
environment:
DB_ROOT_PASS: weeniest-stretch-contaminate-gnarl
DB_ROOT_HOST: db
DATA_FOLDER: "/tmp-downloads"
# SSH_AUTH_SOCK: "/ssh-agent"
env_file:
- .env
depends_on:
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.devcontainer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ services:
MYSQL_ROOT_PASSWORD: weeniest-stretch-contaminate-gnarl
MYSQL_ROOT_HOST: "%"

# mysql 8 container with slight augmentation (+curl, +unzip, +ssh client, ...) for running the DB init scripts
# mysql 8 container for running the DB init scripts
# These init scripts check if the grapher database and users are missing, if so they create them
# and pull the data to have a working dev environment.
db-load-data:
Expand Down
11 changes: 3 additions & 8 deletions docker-compose.grapher.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,29 +35,24 @@ services:
- ./logs:/var/log/mysql
ports:
# Exposing via the port specified for Grapher
# Should always be the same as the WordPress port, because we store both DBs on the same server
- "${GRAPHER_DB_PORT}:3306"
environment:
MYSQL_ROOT_PASSWORD: weeniest-stretch-contaminate-gnarl
MYSQL_ROOT_HOST: "%"

# mysql:8.0 container with slight augmentation (+curl, +unzip, +ssh client, ...) for running the DB init scripts
# These init scripts check if the grapher and wordpress databases and users are missing, if so they create them
# and pull the data to have a working dev environment. As the wordpress donwload needs a working ssh access, it
# mounts the SSH agent and ~/.ssh directory into the container
# mysql:8 container for running the DB init scripts
# These init scripts check if the grapher database and users are missing, if so they create them
# and pull the data to have a working dev environment.
db-load-data:
image: mysql:8
command: "/app/grapher-mysql-init.sh"
volumes:
- ./devTools/docker:/app
- ./tmp-downloads:/tmp-downloads
# - ~/.ssh:/user/.ssh # map the .ssh directory into the container so it knows about the owid-live ssh configuration
# - ${SSH_AUTH_SOCK}:/ssh-agent # Forward the SSH agent socket into the container
environment:
DB_ROOT_PASS: weeniest-stretch-contaminate-gnarl
DB_ROOT_HOST: db
DATA_FOLDER: "/tmp-downloads"
# SSH_AUTH_SOCK: "/ssh-agent"
env_file:
- .env
depends_on:
Expand Down

0 comments on commit 7a706eb

Please sign in to comment.