Skip to content

Commit

Permalink
addressed review feedback; some split into separate issue
Browse files Browse the repository at this point in the history
  • Loading branch information
techsmyth committed Mar 9, 2021
1 parent 8f15b01 commit 60c943d
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 5 deletions.
3 changes: 1 addition & 2 deletions .env.docker
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,5 @@ AUTH_AAD_CLIENT_LOGIN_REDIRECT_URI=http://localhost:3000
AUTH_SIMPLE_AUTH_ISSUER=localhost:3003
AUTH_SIMPLE_AUTH_TOKEN_ENDPOINT=localhost:3003/auth/login
AUTH_SIMPLE_AUTH_CLIENT_SECRET=!#@$#SDFRSF
SECRET=!#@$#SDFRSF

COMPOSE_PROJECT_NAME=cherrytwist-server
COMPOSE_PROJECT_NAME=cherrytwist-server-dev
3 changes: 1 addition & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ FROM node:12-alpine


#install CLI mariadb/mysql client
RUN apk add --update mariadb-client && rm -rf /var/cache/apk/*

RUN apk add --update mariadb-client && apk add python3 && rm -rf /var/cache/apk/*

# Create app directory
WORKDIR /usr/src/app
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ services:
- WAIT_SLEEP_INTERVAL
- WAIT_HOST_CONNECT_TIMEOUT
- SERVICE_ENDPOINT_PORT
- SECRET
- SECRET=AUTH_SIMPLE_AUTH_CLIENT_SECRET
depends_on:
- db
restart: always
Expand Down
Binary file modified docs/diagrams/ct-server-design.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 60c943d

Please sign in to comment.