Docker #6

meyerkev · 2024-08-20T03:41:32Z

We now have a makefile to turn up docker-compose

make up
make down
make clean to destroy all postgres data
make reset to restart all services
make reset-clean to restart all services and destroy all data
make REPO= docker-push to push to Docker

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]>

docker/postgres.Dockerfile

EGjoni

Looks good!

I marked as "Request Changes" in the hopes that having this use Postgres14 instead of 16 isn't too much of a pain.

Also see comments re php-zmq and get_db(). I suspect the latter is why indexing wasn't working for you.

EGjoni · 2024-08-20T05:04:26Z

siikr/internal/globals.php

+/**
+ * Get a handle to the database.
+ */
+function get_db() {


The db may be signed into by two separate users. One as www-data for client accessible scripts, and one as a system user for long running tasks that don't eat up a server thread. So this abstraction would ideally accept an argument to differentiate.

Whichever the approach, most of the variables required are imported from the auth/credentials.php file, which means we have to specify global in order to access them.

function get_db() { global $db_host; global $db_name; global $db_user; global $db_pass; return new PDO("pgsql:host=$db_host;dbname=$db_name", $db_user, $db_pass); }

I will be making these globals into proper constants with the next push. But for now I suspect this is why indexing isn't working for you.

So undo that use of globals and reset all the get_db() calls #5 built?

Yeah, just for now. If for no other reason than to minimize implementation confounders. I'll clean it up on the next version push.

So we'll probably need to setup the www-data user in the sql somehow since these are two isolated users here.

I thought I had done that already as part of the schema and setup_simple.sh. But apparently not. It should be to
the script's php_user, and not the harcoded www-data though.

Man I really should have spent more time cleaning this up before publishing it.

Take a look at my latest push?

Anyway, siikrweb should be fine for all of the basic functionality tasks I think. You're unlikely to need any of the maintenance functions for a little while.

docker/php-fpm.Dockerfile

meyerkev · 2024-08-20T06:41:22Z

siikr/siikr_db_setup.sql

+-- Manually added, needed for healthchecks
+-- Should never ever have a password
+CREATE ROLE postgres WITH LOGIN SUPERUSER;
+


We're going to have to add www-data here, I think.

Or make it a script configured via secrets somehow.

Yeah, this question has come up before.

But now it occurs to me, does this docker composition approach even allow for connecting via unix sockets?
Giving www-data this sort of permission is really only handy if they aren't going to be manually using credentials to get access via a host anyway.

You're almost definitionally connecting between hosts.

But that will still require some very annoying juggling with the setup scripts...hmm

Don't get too involved with this just yet until I see how this works on the NAS that powers on but I've never actually connected to the internet before.

If they have k8s, that's an init container or a helm manifest or something.

I mean, it's a thing that needs doing regardless.

I'd been writing most of the code under the assumption that no one was going to ask me to publish it, and it shows.

EGjoni

Looks good! Does it work?

meyerkev · 2024-08-20T06:55:29Z

Looks good! Does it work?

Hard to tell. It's not giving me any results.

EGjoni · 2024-08-20T07:02:11Z

Looks good! Does it work?

Hard to tell. It's not giving me any results.

sudo tail -f /var/log/postgresql/postgresql-14-main.log
sudo tail -f /var/log/php8.2-fpm.log

alekratz and others added 15 commits August 19, 2024 23:39

Remove -x settings from siikr.conf

756708b

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.

Move Dockerfile -> docker/php-fpm.Dockerfile, and add DB configuratio…

8b95507

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

Add siikr.env to root .gitignore

f422ea5

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

Add postgres_data/ directory to .gitignore

b5a8309

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

docker: Add nginx to the PHP FPM container

0e2d88e

* 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]>

Add siikr/internal/disks.php file creation to php-fpm.Dockerfile

3636659

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

fix(docker): Docker works now

c0d575b

siikrweb must exist as a functional entity

734c0ed

One quick doc line

548cab5

fix(postgres): Removing the postgres superuser password

7950608

meyerkev force-pushed the docker branch from 5d78218 to 7950608 Compare August 20, 2024 04:06

EGjoni reviewed Aug 20, 2024

View reviewed changes

docker/postgres.Dockerfile Outdated Show resolved Hide resolved

meyerkev added 3 commits August 20, 2024 01:00

Made auth an entrypoint script

0ecd316

fixes: Using postgres 14 and proper db connections

155aabd

fix(php): Database connections now work

bb12812

EGjoni requested changes Aug 20, 2024

View reviewed changes

meyerkev added 3 commits August 20, 2024 02:17

Fixed extension installs

4919abf

Fixing get_db()

6c7fb2f

Adding two helper functions for databases

598d13c

meyerkev commented Aug 20, 2024

View reviewed changes

EGjoni reviewed Aug 20, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Docker #6

Docker #6

meyerkev commented Aug 20, 2024 •

edited

Loading

EGjoni left a comment

EGjoni Aug 20, 2024

meyerkev Aug 20, 2024

meyerkev Aug 20, 2024

EGjoni Aug 20, 2024 •

edited

Loading

meyerkev Aug 20, 2024

EGjoni Aug 20, 2024

meyerkev Aug 20, 2024

EGjoni Aug 20, 2024

meyerkev Aug 20, 2024

meyerkev Aug 20, 2024

EGjoni Aug 20, 2024

meyerkev Aug 20, 2024

EGjoni Aug 20, 2024

meyerkev Aug 20, 2024

EGjoni Aug 20, 2024

EGjoni left a comment

meyerkev commented Aug 20, 2024

EGjoni commented Aug 20, 2024

Docker #6

Are you sure you want to change the base?

Docker #6

Conversation

meyerkev commented Aug 20, 2024 • edited Loading

EGjoni left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

EGjoni Aug 20, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

EGjoni left a comment

Choose a reason for hiding this comment

meyerkev commented Aug 20, 2024

EGjoni commented Aug 20, 2024

meyerkev commented Aug 20, 2024 •

edited

Loading

EGjoni Aug 20, 2024 •

edited

Loading