diff --git a/README.md b/README.md index 74ccc84..ad50498 100644 --- a/README.md +++ b/README.md @@ -13,9 +13,9 @@ in Docker containers (https://hub.docker.com/u/gavodachs). ToC: - [Quick Dachs](#quick-dachs) - 1. [Run it](#run-it) - 1. [Build it](#build-it) - 1. [Images](#images) + 1. [Run a published image](#run-a-published-image) + 1. [Build your own image](#build-your-own-image) + 1. [Container flavors](#container-flavors) ## Quick Dachs @@ -26,7 +26,8 @@ By default, Dachs provides its (api) endpoints at port `8080` on `localhost`. > For fine details about DaCHS, refer to the official docs: [soft.g-vo.org](https://soft.g-vo.org/dachs). -### Run it + +### Run a published image If all you wanna do now is to see _Dachs-on-Docker_ running: ```bash @@ -101,45 +102,11 @@ Then we start Postgres to finally start Dachs (in `debug` mode to have it verbos You go to [http://localhost:8080](http://localhost:8080) and you should see Dachs frontpage: -![Landing page](docs/landing_page.png) - -And in the terminal, lines like the following should pop out in the terminal: -```bash - [-] 172.17.0.1 - - [] "GET / HTTP/1.1" 200 1221 "-" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.1.2 Safari/605.1.15" - [-] 172.17.0.1 - - [] "GET /static/js/jquery-gavo.js HTTP/1.1" 200 66576 "http://localhost:8080/" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.1.2 Safari/605.1.15" - [-] 172.17.0.1 - - [] "GET /static/img/logo_medium.png HTTP/1.1" 200 48422 "http://localhost:8080/" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.1.2 Safari/605.1.15" -(...) -``` - -While this terminal is being used by `dachs` server we can open another terminal -and attach to the same container (dachs): - -```bash -[~/]$ docker exec -it dachs bash -[root@10dd4547e]$ -[root@10dd4547e]$ # The services running, for example: -[root@10dd4547e]$ -[root@10dd4547e]$ ps ax - PID TTY STAT TIME COMMAND - 1 pts/0 Ss 0:00 /bin/bash --rcfile /help.sh - 50 ? Ss 0:00 /usr/lib/postgresql/13/bin/postgres -D /var/lib/postgresql/13/main -c config_file=/etc/postgresql/13/main/postgresql.conf - 52 ? Ss 0:00 postgres: 13/main: checkpointer - 53 ? Ss 0:00 postgres: 13/main: background writer - 54 ? Ss 0:00 postgres: 13/main: walwriter - 55 ? Ss 0:00 postgres: 13/main: autovacuum launcher - 56 ? Ss 0:00 postgres: 13/main: stats collector - 57 ? Ss 0:00 postgres: 13/main: logical replication launcher - 75 pts/0 Sl+ 0:01 /usr/bin/python3 /usr/bin/dachs serve debug - 76 ? Ss 0:00 postgres: 13/main: gavo gavo 127.0.0.1(53334) idle - 78 ? Ss 0:00 postgres: 13/main: gavo gavo 127.0.0.1(53338) idle - 133 pts/1 Ss 0:00 bash - 139 pts/1 R+ 0:00 ps ax -[root@10dd4547e]$ -``` +![Landing page](docs/landing_page.png) -### Build it +### Build your own image Likewise, if you just want to build the latest `dachs` image, do: ```bash @@ -167,7 +134,7 @@ PSQL version: 13.5 > For more details on _building_ images, go to [dockerfiles/README.md](dockerfiles/README.md) -### Images +### Container flavors The containers are built on top of Debian Bullseye image, which GAVO/DaCHS package is part of the _main_ (and _backports_) repository (current Dachs version: 2.3). For the `latest` images we use also GAVO repositories, where updates go first (current Dachs version: 2.5).