Merge 680dec30ca into 5000983a36

Release 1.23.6
Merge branch 'main' into feature/issue-61/jackson-docker-compose
2024-05-01 10:47:24 +05:30 · 2024-04-30 22:32:49 +01:00 · 2023-10-18 10:15:51 -04:00 · 2023-10-08 17:16:09 -04:00
3 changed files with 19 additions and 3 deletions
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -0,0 +1,16 @@
+version: "3.6"
+services:
+  jackson:
+    build: .
+    ports:
+      - "5225:5225"
+    command: [ "node", "server.js" ]
+    environment:
+      DB_ENGINE: "sql"
+      DB_TYPE: "postgres"
+      DB_URL: "postgres://postgres:postgres@postgres:5432/postgres"
+      JACKSON_API_KEYS: "secret"
+      NEXTAUTH_URL: "http://localhost:5225"
+      EXTERNAL_URL: "http://localhost:5225"
+      NEXTAUTH_SECRET: "super-secret"
+      NEXTAUTH_ADMIN_CREDENTIALS: "admin@company.com:secretpassword"
--- a/package-lock.json
+++ b/package-lock.json
@ -1,12 +1,12 @@
 {
  "name": "jackson",
-  "version": "1.23.5",
+  "version": "1.23.6",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "jackson",
-      "version": "1.23.5",
+      "version": "1.23.6",
      "hasInstallScript": true,
      "license": "Apache-2.0",
      "dependencies": {
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "jackson",
-  "version": "1.23.5",
+  "version": "1.23.6",
  "private": true,
  "description": "SAML 2.0 service",
  "keywords": [
Author	SHA1	Message	Date
Melissa Tamplin	0285e2b3b1	Merge `680dec30ca` into `5000983a36`	2024-05-01 10:47:24 +05:30
Deepak Prabhakara	5000983a36	Release 1.23.6	2024-04-30 22:32:49 +01:00
Melissa Tamplin	680dec30ca	Merge branch 'main' into feature/issue-61/jackson-docker-compose	2023-10-18 10:15:51 -04:00
Mel Tamplin	73bfe25349	feat: transfer docker run command in docker compose file to run jackson with postgres Signed-off-by: Mel Tamplin <mei.chohee@gmail.com>	2023-10-08 17:16:09 -04:00