From cf31ccbea07900b9feaab77d4a6a63eebc618278 Mon Sep 17 00:00:00 2001 From: Shane Kilkelly Date: Tue, 6 Nov 2018 13:55:58 +0000 Subject: [PATCH] Update to account for dev-env changes --- services/git-bridge/README.md | 19 +++---------------- services/git-bridge/docker-compose.yml | 17 ----------------- 2 files changed, 3 insertions(+), 33 deletions(-) delete mode 100644 services/git-bridge/docker-compose.yml diff --git a/services/git-bridge/README.md b/services/git-bridge/README.md index 0b730b8546..1b01ddc49e 100644 --- a/services/git-bridge/README.md +++ b/services/git-bridge/README.md @@ -95,24 +95,11 @@ The configuration file is in `.json` format. You have to restart the server for configuration changes to take effect. -## Setup with v2 Dev-Environment - -- Set `APP_GIT_BRIDGE_URL=http://localhost:8000` in v1 `common.env` -- In this repo, copy `conf/example.json` to `conf/local.json` -- Set up an OAuth app in v1 - - with `scopes = 'git_bridge'`, and `callback = 'http://v1.overleaf.test:500/no-callback'` - - (see below for SQL to do this) -- Update values in `conf/local.json`: - - Set oauth creds - - `swapStore = {type: "noop"}"` - - `apiBaseUrl = "http://www.overleaf.test:5000/api/v0"` - - `postbackBaseUrl = "http://git_bridge:8000"` - - `oauth2Server = "http://www.overleaf.test:5000"` -- From this repo, `docker-compose up` - - ## Creating OAuth app +In dev-env, run `bin/run rails_v1 rake db:seed`, or, if using this solo, run the following in the v1 +database: + ```sql INSERT INTO public.oauth_applications ( "name", uid, secret, redirect_uri, scopes, skip_authorization, diff --git a/services/git-bridge/docker-compose.yml b/services/git-bridge/docker-compose.yml deleted file mode 100644 index 6efadb0e59..0000000000 --- a/services/git-bridge/docker-compose.yml +++ /dev/null @@ -1,17 +0,0 @@ -version: "3" - -networks: - default: - external: - name: sharelatex_overleaf - -services: - git_bridge: - build: - context: . - dockerfile: Dockerfile - volumes: - - .:/app - command: make run - ports: - - 8000:8000