Page MenuHomePhorge
Files F85824681

No OneTemporary
Actions

Authored By
Unknown
Size
3 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/.gitignore b/.gitignore
index 4009bd844..e2ef4513b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,61 +1,63 @@
# App artifacts
/_build
/db
/deps
/*.ez
/test/instance
/test/uploads
/.elixir_ls
/test/fixtures/DSCN0010_tmp.jpg
/test/fixtures/test_tmp.txt
/test/fixtures/image_tmp.jpg
/test/tmp/
/doc
/instance
/priv/ssh_keys
# Prevent committing custom emojis
/priv/static/emoji/custom/*
# Generated on crash by the VM
erl_crash.dump
# Files matching config/*.secret.exs pattern contain sensitive
# data and you should not commit them into version control.
#
# Alternatively, you may comment the line below and commit the
# secrets files as long as you replace their contents by environment
# variables.
/config/*.secret.exs
/config/generated_config.exs
/config/runtime.exs
/config/*.env
# Database setup file, some may forget to delete it
/config/setup_db*.psql
.DS_Store
.env
# Editor config
/.vscode/
# Prevent committing docs files
/priv/static/doc/*
docs/generated_config.md
# Code test coverage
/cover
/Elixir.*.coverdata
/coverage.xml
.idea
pleroma.iml
# asdf
.tool-versions
# Editor temp files
/*~
/*#
+
+workdir
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 4691f68bb..4d7c50674 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -1,14 +1,18 @@
#!/bin/ash
set -e
echo "-- Waiting for database..."
while ! pg_isready -U ${DB_USER:-pleroma} -d postgres://${DB_HOST:-db}:${DB_PORT:-5432}/${DB_NAME:-pleroma} -t 1; do
sleep 1s
done
+echo "-- Creating db..."
+$HOME/bin/pleroma_ctl create
+
+
echo "-- Running migrations..."
$HOME/bin/pleroma_ctl migrate
echo "-- Starting!"
exec $HOME/bin/pleroma start
diff --git a/installation/docker-compose/docker-compose.yml b/installation/docker-compose/docker-compose.yml
new file mode 100644
index 000000000..5c6fc295d
--- /dev/null
+++ b/installation/docker-compose/docker-compose.yml
@@ -0,0 +1,36 @@
+version: '3.4'
+
+services:
+ web:
+ build: ../..
+ ports:
+ - "4000:4000"
+ environment:
+ DB_USER: postgres
+ DB_PASS: postgres
+ GRAFANA_HOST: http://grafana:3000
+ volumes:
+ - "./workdir/pleroma:/var/lib/pleroma"
+ restart: "always"
+ db:
+ image: postgres:16
+ environment:
+ POSTGRES_USER: postgres
+ POSTGRES_PASSWORD: postgres
+ PGDATA: "/pg_data"
+ restart: "always"
+ volumes:
+ - "./workdir/pg_data:/pg_data"
+ grafana:
+ image: grafana/grafana-enterprise
+ ports:
+ - "3000:3000"
+ volumes:
+ - "./workdir/grafana:/var/lib/grafana"
+ - "./grafana-provisioning/:/etc/grafana/provisioning/"
+ prometheus:
+ image: prom/prometheus
+ ports:
+ - "9090:9090"
+ volumes:
+ - "./prometheus.yml:/etc/prometheus/prometheus.yml"
diff --git a/installation/docker-compose/grafana-provisioning/datasources/datasource.yml b/installation/docker-compose/grafana-provisioning/datasources/datasource.yml
new file mode 100644
index 000000000..bf3bc3eed
--- /dev/null
+++ b/installation/docker-compose/grafana-provisioning/datasources/datasource.yml
@@ -0,0 +1,7 @@
+apiVersion: 1
+
+datasources:
+
+- name: pleroma
+ type: prometheus
+ url: http://prometheus:9090
diff --git a/installation/docker-compose/prometheus.yml b/installation/docker-compose/prometheus.yml
new file mode 100644
index 000000000..d6c31cda5
--- /dev/null
+++ b/installation/docker-compose/prometheus.yml
@@ -0,0 +1,5 @@
+scrape_configs:
+ - job_name: "pleroma"
+ scrape_interval: 5s
+ static_configs:
+ - targets: ['web:4021']

File Metadata

Mime Type
text/x-diff
Expires
Thu, Oct 29, 5:55 PM (1 d, 11 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1798439
Default Alt Text
(3 KB)

Event Timeline