From 9ed1d6896d933b73e9c751dc86ff8d70181b5c96 Mon Sep 17 00:00:00 2001
From: Samuel Roberts <sam.roberts@geant.org>
Date: Tue, 4 Jan 2022 16:05:27 +0000
Subject: [PATCH] remove unneeded postgres setup in docker compose (sqlite is
fine)
---
docker-setup/config/grafana.ini | 3 +--
docker-setup/docker-compose.yaml | 13 ----------
docker-setup/entrypoint.sh | 43 --------------------------------
3 files changed, 1 insertion(+), 58 deletions(-)
delete mode 100755 docker-setup/entrypoint.sh
diff --git a/docker-setup/config/grafana.ini b/docker-setup/config/grafana.ini
index 68694ff..438a543 100644
--- a/docker-setup/config/grafana.ini
+++ b/docker-setup/config/grafana.ini
@@ -57,8 +57,7 @@ logging = true
[database]
# Either "mysql", "postgres" or "sqlite3", it's your choice
-type = postgres
-host = postgres
+type = sqlite3
name = grafana
user = grafana
password = grafana
diff --git a/docker-setup/docker-compose.yaml b/docker-setup/docker-compose.yaml
index 5847a3c..a4512b0 100644
--- a/docker-setup/docker-compose.yaml
+++ b/docker-setup/docker-compose.yaml
@@ -10,17 +10,4 @@ services:
- ./config:/etc/grafana/
environment:
- GF_INSTALL_PLUGINS=grafana-simple-json-datasource
- postgres:
- restart: always
- build:
- context: .
- args:
- DBUSER: grafana
- DBPASS: grafana
- DBNAME: grafana
- hostname: postgres
- ports:
- - "5432:5432"
- volumes:
- - ./postgresdata:/var/lib/postgresql:z
diff --git a/docker-setup/entrypoint.sh b/docker-setup/entrypoint.sh
deleted file mode 100755
index e85d1e5..0000000
--- a/docker-setup/entrypoint.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-
-# Entrypoint for the containerized database
-# Ensures the required setup is performed on the share before
-# starting the database
-
-if [ "$PGDATA" = "" ]
-then
- echo "Environment variable PGDATA is not set"
- exit 1
-fi
-
-if [ ! -d "$PGDATA" ]
-then
- echo "Directory $PGDATA does not exist - no volume mounted?"
- exit 2
-fi
-
-# Postgres will refuse to work on a non-empty folder when initializing and the
-# mount point might have a dotfile
-PGDATA="$PGDATA/9.6"
-
-echo $PGDATA
-echo $DBNAME
-echo $DBUSER
-
-if [ ! -d "$PGDATA" ]
-then
- echo "Database seems to be uninitialized - doing so"
- mkdir $PGDATA
- initdb --pgdata=$PGDATA && \
- pg_ctl start && \
- sleep 4 && \
- createuser -d -l -s $DBUSER && \
- createdb -O $DBUSER $DBNAME && \
- psql -c "ALTER ROLE $DBUSER WITH PASSWORD '$DBPASS'" && \
- psql -a $DBNAME -c 'CREATE EXTENSION "uuid-ossp" WITH SCHEMA pg_catalog' && \
- echo "host all all all md5" >> $PGDATA/pg_hba.conf && \
- echo "listen_addresses = '0.0.0.0'" >> $PGDATA/postgresql.conf && \
- pg_ctl stop
-fi
-
-exec /usr/bin/postgres
--
GitLab