Skip to content

Commit

Permalink
Merge pull request #153 from Karol-2/keycloak
Browse files Browse the repository at this point in the history
Add Keycloak
  • Loading branch information
gf-rog authored Apr 2, 2024
2 parents f86702c + 00c5b1c commit 5e3c07e
Show file tree
Hide file tree
Showing 78 changed files with 5,592 additions and 6,248 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:

- name: Wait for containers to start
run: |
sleep 18
sleep 100
docker run \
--rm \
--network mercury-project_default \
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
node_modules/
node_modules/
build/
2 changes: 1 addition & 1 deletion backend/.env
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TOKEN_SECRET=27a0967eed44a78feec1ccd9225343258894288202c0a45a8f93adce6786dbc9ae5a7fc4df716f29eefed7067d9b94fa9f7c2ab7dd7781d36cb22206bf25b886
LINK_SECRET=ijr2iq34rfeiadsfkjq3ew

CLIENT_SECRET=fOP43IDxXavjRogZMQWKW1qmJAz5zeEf
2 changes: 1 addition & 1 deletion backend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:18-alpine
FROM node:21-alpine
WORKDIR /home/node/app
COPY *.json .
COPY ./src ./src
Expand Down
Loading

0 comments on commit 5e3c07e

Please sign in to comment.