Docker #6

siikr.conf should probably be treated as a configuration or env file, so it should not have execute permissions. It should only be invoked by using `source` in your shell.

The Dockerfile tries to emulate the simple_setup.sh script as closely as possible. A couple of quirks: * php-zmq does not appear to have a Debian package, and the package on PECL is from 2016 and the repo has been abandoned. Instead, we need to compile it from source. Not a huge deal, but still annoying. * Since the msgrouter service can't really run in Docker (since it uses systemd services) I have opted to use supervisord. See here: https://docs.docker.com/config/containers/multi-service_container/ Signed-off-by: Alek Ratzloff <[email protected]>

Since siikr.conf is more of an environment file, the extension should reflect that. I have also renamed it to siikr.example.env - this is so that if the configuation is changed, it will only go into the example env file, and not cause issues with pulling down into a modified siikr.env file. Additionally, it helps prevent in-dev configuration from accidentally getting committed in the case that someone uses `git commit -a` a bit carelessly. Signed-off-by: Alek Ratzloff <[email protected]>

…n step to php-fpm.Dockerfile Signed-off-by: Alek Ratzloff <[email protected]>

…nd update README + env example * docker-compose.yaml for docker-compose command * postgres.Dockerfile sets up Postgres appropriately * create_database.sh script will create the Postgres database from the SQL in the siikr directory in the Docker container * README includes base instructions for using docker-compose * Update siikr.example.env to include the POSTGRES_* environment variables necessary for Docker deployment Signed-off-by: Alek Ratzloff <[email protected]>

Signed-off-by: Alek Ratzloff <[email protected]>

* DB host was not previously available in the user configuration, this is now added in case your DB is hosted anywhere besides localhost (as is the case with Docker) * All of the `new PDO` calls were either using a hard-coded database user or getting the currently logged in UNIX user, rather than the configured user. The password was also being set to null. This is resolved with the `get_db()` function in the internal/globals.php file. All calls to `new PDO` are also updated so we don't have to update it in 6 different places, either. Signed-off-by: Alek Ratzloff <[email protected]>

Signed-off-by: Alek Ratzloff <[email protected]>

* Forward port 80 -> 8080 * Install nginx in php container * Add a php-fpm-siikr.conf file for Docker * Add an nginx-siikr.conf file Docker Signed-off-by: Alek Ratzloff <[email protected]>

Signed-off-by: Alek Ratzloff <[email protected]>

* Use `isset` on the $_GET key, instead of checking for implicit membership * Add a catch for `DivisionByZeroError` in the show_page.php - not sure why the `catch (Exception $e)` wasn't catching it. (We can fix it later) Signed-off-by: Alek Ratzloff <[email protected]>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Docker #6

Docker #6

Commits on Aug 20, 2024

Docker #6

Are you sure you want to change the base?

Docker #6

Commits on Aug 20, 2024