diff options
| author | Jan Keromnes <janx@linux.com> | 2020-12-05 12:24:33 +0100 |
|---|---|---|
| committer | Rigel Kent <par@rigelk.eu> | 2020-12-06 13:58:00 +0100 |
| commit | ef62d58674a23ecee2dafef3b42e2bb771c9e6f6 (patch) | |
| tree | 9c867ce75ba36e537675ead429b49fcc7b880f40 | |
| parent | 95bd9515b86e577033d9929c829c77c0df761acf (diff) | |
| download | PeerTube-ef62d58674a23ecee2dafef3b42e2bb771c9e6f6.tar.gz PeerTube-ef62d58674a23ecee2dafef3b42e2bb771c9e6f6.tar.zst PeerTube-ef62d58674a23ecee2dafef3b42e2bb771c9e6f6.zip | |
Fix PostreSQL initialization for Gitpod
| -rw-r--r-- | .gitpod.yml | 12 | ||||
| -rw-r--r-- | support/docker/gitpod/Dockerfile | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/.gitpod.yml b/.gitpod.yml index c2f2fa464..4ccaeabe3 100644 --- a/.gitpod.yml +++ b/.gitpod.yml | |||
| @@ -10,7 +10,11 @@ ports: | |||
| 10 | - port: 9000 | 10 | - port: 9000 |
| 11 | onOpen: ignore | 11 | onOpen: ignore |
| 12 | tasks: | 12 | tasks: |
| 13 | - command: redis-server | 13 | - name: Redis |
| 14 | - before: export NODE_CONFIG="{\"import\":{\"videos\":{\"torrent\":{\"enabled\":false}}},\"webserver\":{\"hostname\":\"$(gp url 3000 | cut -d/ -f3)\",\"port\":\"443\",\"https\":true}}" | 14 | command: redis-server |
| 15 | init: yarn install --pure-lockfile | 15 | - name: PeerTube |
| 16 | command: npm run dev \ No newline at end of file | 16 | before: export NODE_CONFIG="{\"import\":{\"videos\":{\"torrent\":{\"enabled\":false}}},\"webserver\":{\"hostname\":\"$(gp url 3000 | cut -d/ -f3)\",\"port\":\"443\",\"https\":true}}" |
| 17 | init: > | ||
| 18 | psql -h localhost -d postgres --file=support/docker/gitpod/setup_postgres.sql && | ||
| 19 | yarn install --pure-lockfile | ||
| 20 | command: npm run dev | ||
diff --git a/support/docker/gitpod/Dockerfile b/support/docker/gitpod/Dockerfile index e18c392bf..1f9e80e3c 100644 --- a/support/docker/gitpod/Dockerfile +++ b/support/docker/gitpod/Dockerfile | |||
| @@ -9,7 +9,3 @@ RUN sudo apt-get update -q && sudo apt-get install -qy \ | |||
| 9 | ffmpeg \ | 9 | ffmpeg \ |
| 10 | openssl \ | 10 | openssl \ |
| 11 | redis-server | 11 | redis-server |
| 12 | |||
| 13 | # Set up PostgreSQL. | ||
| 14 | COPY --chown=gitpod:gitpod support/docker/gitpod/setup_postgres.sql /tmp/ | ||
| 15 | RUN pg_start && psql -h localhost -d postgres --file=/tmp/setup_postgres.sql && pg_stop | ||