From 5dc4764699d0555ca176ee426e02df8b9f974441 Mon Sep 17 00:00:00 2001 From: Frederik Ring Date: Sat, 25 May 2019 17:34:09 +0200 Subject: [PATCH] add detailed README per directory --- README.md | 73 +--------------------------------------------- docker-compose.yml | 3 +- 2 files changed, 2 insertions(+), 74 deletions(-) diff --git a/README.md b/README.md index 6a1c2f4..0b05640 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ > The offen analytics software -This repository contains all source code needed to build and run __offen__, both on the server as well as on the client. +This repository contains all source code needed to build and run __offen__, both on the server as well as on the client. See each of the READMEs in the subdirectories for instructions on how to work on that particular area of the application. --- @@ -44,77 +44,6 @@ $ docker-compose up Now you should be able to access in your browser without any security warnings. -#### `server` - -To work on the `server` you will need to install `docker-compose` and Go 1.12+. - -First, bootstrap the dockerized Postgres database used for development: - -``` -docker-compose run server make bootstrap -``` - -Run the server: - -``` -docker-compose up -``` - -Run the tests: - -``` -docker-compose run server make -``` - -#### `vault` - -To work on the `vault` you will need to install `docker-compose`. - -First, install the project's dependencies: - -``` -cd vault -npm install -``` - -Run the server: - -``` -docker-compose up -``` - -Run the tests: - -``` -cd vault -npm test -``` - -#### `script` - -To work on the `script` you will need to install `docker-compose`. - -First, install the project's dependencies: - -``` -cd script -npm install -``` - -Run the server: - -``` -docker-compose up -``` - -Run the tests: - -``` -cd script -npm test -``` - - ### License MIT © [offen](https://www.offen.dev) diff --git a/docker-compose.yml b/docker-compose.yml index 066e1f8..397c44e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,10 +9,9 @@ server: environment: - GOPATH=/go - POSTGRES_CONNECTION_STRING=postgres://postgres:develop@database:5432/postgres?sslmode=disable - - VAULT_HOST=https://local.offen.dev:9977 ports: - 8080:8080 - command: go run cmd/server/main.go -conn postgres://postgres:develop@database:5432/postgres?sslmode=disable -key local.offen.dev-key.pem -cert local.offen.dev.pem + command: go run cmd/server/main.go -origin https://local.offen.dev:9977 -conn postgres://postgres:develop@database:5432/postgres?sslmode=disable -key local.offen.dev-key.pem -cert local.offen.dev.pem links: - database