From f96db4bb1402c29b6a67619776b3c9eea706e763 Mon Sep 17 00:00:00 2001 From: Michael Hoennig Date: Sat, 10 Aug 2024 07:59:21 +0200 Subject: [PATCH] add alias to run full import into docker-compose specified PostgreSQL --- .aliases | 6 ++++++ docker-compose.yml => etc/docker-compose.yml | 10 +++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) rename docker-compose.yml => etc/docker-compose.yml (65%) diff --git a/.aliases b/.aliases index f215442d..be378ea2 100644 --- a/.aliases +++ b/.aliases @@ -84,3 +84,9 @@ alias fp='grep -r '@Accepts' src | sed -e 's/^.*@/@/g' | sort -u | wc -l' alias gw-spotless='./gradlew spotlessApply -x pitest -x test -x :processResources' alias gw-test='. .aliases; ./gradlew test importOfficeData' alias gw-check='. .aliases; gw test importOfficeData check -x pitest -x :dependencyCheckAnalyze' + +# etc/docker-compose.yml limits CPUs+MEM and includes a PostgreSQL config for analysing slow queries +alias gw-importOfficeData-in-docker-compose=' + docker-compose -f etc/docker-compose.yml down && + docker-compose -f etc/docker-compose.yml up -d && sleep 10 && + time gw-importHostingAssets' diff --git a/docker-compose.yml b/etc/docker-compose.yml similarity index 65% rename from docker-compose.yml rename to etc/docker-compose.yml index 974104bb..601038dd 100644 --- a/docker-compose.yml +++ b/etc/docker-compose.yml @@ -7,7 +7,7 @@ services: environment: POSTGRES_PASSWORD: password volumes: - - /home/mi/Projekte/Hostsharing/hsadmin-ng/etc/postgresql-log-slow-queries.conf:/etc/postgresql/postgresql.conf + - ./postgresql-log-slow-queries.conf:/etc/postgresql/postgresql.conf ports: - "5432:5432" command: @@ -17,3 +17,11 @@ services: apt-get update && apt-get install -y postgresql-contrib && docker-entrypoint.sh postgres -c config_file=/etc/postgresql/postgresql.conf + deploy: + resources: + limits: + cpus: '4' + memory: 4G + reservations: + cpus: '2' + memory: 2G