OpenNeo/impress
OpenNeo/impress
1
0
Fork 1
Code Pull requests Activity

Move the host: db part of the dev container into its environment vars

Browse source 
Okay, so I've kept `database.yml` using the new username and password
`impress_dev`, cuz I like that it helps clarify that it's dev stuff and
is impossible to confuse with prod. (I updated my local setup to match!)

But hardcoding `host: db` into here breaks my local setup where the
database _isn't_ at the hostname `db`. So I add a way for new optional
database URL environment variables to get merged in with these settings,
and then configured the dev container to use that—and just in the most
limited override possible, to avoid duplicating stuff we don't need to.
(I could've just used the same names `DATABASE_URL_{PRIMARY,OPENNEO_ID}`
for this, but idk, I think it's confusing to have the same one for both
dev and prod, even though Rails _does_ basically do this; see below.)

Normally, the environment variable `DATABASE_URL` just _does_ this, and
you don't need to include a `url` key at all to get this behavior. But
since we've got the legacy two-database thing going on, we do this
instead! If we were to merge the `openneo_id.users` table into the
primary database, we could simplify this!
This commit is contained in:
Emi Matchu 2023-10-26 14:20:15 -07:00
parent e022e8dbfb
commit 6bbef7e75e
2 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
.devcontainer/devcontainer.json
View file

@ -22,11 +22,16 @@
// Use 'postCreateCommand' to run commands after the container is created. // Use 'postCreateCommand' to run commands after the container is created.
"postCreateCommand": ".devcontainer/post-create.sh", "postCreateCommand": ".devcontainer/post-create.sh",
// HACK: Out of the box, this dev container doesn't allow installation to the
// default GEM_HOME, because of a weird thing going on with RVM. Instead, we
// set a custom GEM_HOME and GEM_PATH in our home directory!
// https://github.com/devcontainers/templates/issues/188
"containerEnv": { "containerEnv": {
// Because the database is hosted on the local network at the hostname `db`,
// we partially override `config/database.yml` to connect to `db`!
"DATABASE_URL_PRIMARY_DEV": "mysql2://db",
"DATABASE_URL_OPENNEO_ID_DEV": "mysql2://db",
// HACK: Out of the box, this dev container doesn't allow installation to
// the default GEM_HOME, because of a weird thing going on with RVM.
// Instead, we set a custom GEM_HOME and GEM_PATH in our home directory!
// https://github.com/devcontainers/templates/issues/188
"GEM_HOME": "~/.rubygems", "GEM_HOME": "~/.rubygems",
"GEM_PATH": "~/.rubygems" "GEM_PATH": "~/.rubygems"
} }

8
config/database.yml
View file

@ -1,7 +1,9 @@
development: development:
primary: primary:
# You can override these default settings with this environment variable,
# fully or partially. We do this in the .devcontainer setup!
url: <%= ENV['DATABASE_URL_PRIMARY_DEV'] %>
adapter: mysql2 adapter: mysql2
host: db
database: openneo_impress database: openneo_impress
username: impress_dev username: impress_dev
password: impress_dev password: impress_dev
@ -10,8 +12,10 @@ development:
sql_mode: TRADITIONAL sql_mode: TRADITIONAL
openneo_id: openneo_id:
# You can override these default settings with this environment variable,
# fully or partially. We do this in the .devcontainer setup!
url: <%= ENV['DATABASE_URL_OPENNEO_ID_DEV'] %>
adapter: mysql2 adapter: mysql2
host: db
database: openneo_id database: openneo_id
username: impress_dev username: impress_dev
password: impress_dev password: impress_dev