Merge pull request #94 from memphisdev/master

release 1.4.1
superstreamlabs · Dec 13, 2023 · fbb4bbd · fbb4bbd
2 parents 7094cf1 + bb67a73
commit fbb4bbd
Show file tree

Hide file tree

Showing 5 changed files with 136 additions and 53 deletions.
diff --git a/.github/scripts/mandatory_variable_check.sh b/.github/scripts/mandatory_variable_check.sh
@@ -4,7 +4,7 @@
 STATUS=TRUE
 # Array of mandatory expressions in docker-compose file
 
-array=( DOCKER_ENV=true ROOT_PASSWORD=memphis CONNECTION_TOKEN=memphis )
+array=( DOCKER_ENV: true ROOT_PASSWORD: memphis CONNECTION_TOKEN: memphis )
 
 # For loop that validate each expression in array
 for i in "${array[@]}"

diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
@@ -11,10 +11,10 @@ services:
     ports:
       - '5005:5005'
     environment:
-      - POSTGRESQL_USERNAME=memphis
-      - POSTGRESQL_PASSWORD=memphis
-      - POSTGRESQL_DATABASE=memphis
-      - POSTGRESQL_PORT_NUMBER=5005
+      POSTGRESQL_USERNAME: memphis
+      POSTGRESQL_PASSWORD: memphis
+      POSTGRESQL_DATABASE: memphis
+      POSTGRESQL_PORT_NUMBER: 5005
   memphis:
     image: "memphisos/memphis:latest"
     depends_on:
@@ -34,12 +34,12 @@ services:
       - "6666:6666"
       - "7770:7770"
     environment:
-      - ROOT_PASSWORD=memphis
-      - DOCKER_ENV=true
-      - ENV=staging
-      - USER_PASS_BASED_AUTH=true
-      - CONNECTION_TOKEN=memphis
-      - METADATA_DB_HOST=memphis-metadata
+      ROOT_PASSWORD: memphis
+      DOCKER_ENV: true
+      ENV: staging
+      USER_PASS_BASED_AUTH: true
+      CONNECTION_TOKEN: memphis
+      METADATA_DB_HOST: memphis-metadata
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
 
@@ -55,14 +55,14 @@ services:
     ports:
       - "4444:4444"
     environment:
-      - JWT_SECRET=JWT_TEST_PURPOSE
-      - REFRESH_JWT_SECRET=REFRESH_JWT_TEST_PURPOSE
-      - USER_PASS_BASED_AUTH=true
-      - CONNECTION_TOKEN=memphis
-      - ROOT_USER=root
-      - ROOT_PASSWORD=memphis
-      - MEMPHIS_HOST=memphis
-      - HTTP_PORT=4444
+      JWT_SECRET: JWT_TEST_PURPOSE
+      REFRESH_JWT_SECRET: REFRESH_JWT_TEST_PURPOSE
+      USER_PASS_BASED_AUTH: true
+      CONNECTION_TOKEN: memphis
+      ROOT_USER: root
+      ROOT_PASSWORD: memphis
+      MEMPHIS_HOST: memphis
+      HTTP_PORT: 4444
 networks:
   memphis:
     ipam:

diff --git a/docker-compose-latest.yml b/docker-compose-latest.yml
@@ -11,10 +11,10 @@ services:
     ports:
       - '5005:5005'
     environment:
-      - POSTGRESQL_USERNAME=memphis
-      - POSTGRESQL_PASSWORD=memphis
-      - POSTGRESQL_DATABASE=memphis
-      - POSTGRESQL_PORT_NUMBER=5005
+      POSTGRESQL_USERNAME: memphis
+      POSTGRESQL_PASSWORD: memphis
+      POSTGRESQL_DATABASE: memphis
+      POSTGRESQL_PORT_NUMBER: 5005
   memphis:
     image: "memphisos/memphis:latest"
     depends_on:
@@ -34,11 +34,11 @@ services:
       - "6666:6666"
       - "7770:7770"
     environment:
-      - ROOT_PASSWORD=memphis
-      - DOCKER_ENV=true
-      - USER_PASS_BASED_AUTH=true
-      - CONNECTION_TOKEN=memphis
-      - METADATA_DB_HOST=memphis-metadata
+      ROOT_PASSWORD: memphis
+      DOCKER_ENV: true
+      USER_PASS_BASED_AUTH: true
+      CONNECTION_TOKEN: memphis
+      METADATA_DB_HOST: memphis-metadata
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
 
@@ -54,14 +54,14 @@ services:
     ports:
       - "4444:4444"
     environment:
-      - JWT_SECRET=JWT_TEST_PURPOSE
-      - REFRESH_JWT_SECRET=REFRESH_JWT_TEST_PURPOSE
-      - USER_PASS_BASED_AUTH=true
-      - CONNECTION_TOKEN=memphis
-      - ROOT_USER=root
-      - ROOT_PASSWORD=memphis
-      - MEMPHIS_HOST=memphis
-      - HTTP_PORT=4444
+      JWT_SECRET: JWT_TEST_PURPOSE
+      REFRESH_JWT_SECRET: REFRESH_JWT_TEST_PURPOSE
+      USER_PASS_BASED_AUTH: true
+      CONNECTION_TOKEN: memphis
+      ROOT_USER: root
+      ROOT_PASSWORD: memphis
+      MEMPHIS_HOST: memphis
+      HTTP_PORT: 4444
 networks:
   memphis:
     ipam:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -11,10 +11,10 @@ services:
     ports:
       - '5005:5005'
     environment:
-      - POSTGRESQL_USERNAME=memphis
-      - POSTGRESQL_PASSWORD=memphis
-      - POSTGRESQL_DATABASE=memphis
-      - POSTGRESQL_PORT_NUMBER=5005
+      POSTGRESQL_USERNAME: memphis
+      POSTGRESQL_PASSWORD: memphis
+      POSTGRESQL_DATABASE: memphis
+      POSTGRESQL_PORT_NUMBER: 5005
   memphis:
     image: "memphisos/memphis:1.4.0"
     depends_on:
@@ -34,11 +34,11 @@ services:
       - "6666:6666"
       - "7770:7770"
     environment:
-      - ROOT_PASSWORD=memphis
-      - DOCKER_ENV=true
-      - USER_PASS_BASED_AUTH=true
-      - CONNECTION_TOKEN=memphis
-      - METADATA_DB_HOST=memphis-metadata
+      ROOT_PASSWORD: memphis
+      DOCKER_ENV: true
+      USER_PASS_BASED_AUTH: true
+      CONNECTION_TOKEN: memphis
+      METADATA_DB_HOST: memphis-metadata
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
 
@@ -54,14 +54,14 @@ services:
     ports:
       - "4444:4444"
     environment:
-      - JWT_SECRET=JWT_TEST_PURPOSE
-      - REFRESH_JWT_SECRET=REFRESH_JWT_TEST_PURPOSE
-      - USER_PASS_BASED_AUTH=true
-      - CONNECTION_TOKEN=memphis
-      - ROOT_USER=root
-      - ROOT_PASSWORD=memphis
-      - MEMPHIS_HOST=memphis
-      - HTTP_PORT=4444
+      JWT_SECRET: JWT_TEST_PURPOSE
+      REFRESH_JWT_SECRET: REFRESH_JWT_TEST_PURPOSE
+      USER_PASS_BASED_AUTH: true
+      CONNECTION_TOKEN: memphis
+      ROOT_USER: root
+      ROOT_PASSWORD: memphis
+      MEMPHIS_HOST: memphis
+      HTTP_PORT: 4444
 networks:
   memphis:
     ipam:

diff --git a/examples/docker-compose-dev-with-users.yml b/examples/docker-compose-dev-with-users.yml
@@ -0,0 +1,83 @@
+services:
+  memphis-metadata:
+    image: memphisos/memphis-metadata:docker-15.2.0-debian-11-r27
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U memphis -p 5005"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
+    networks:
+      - memphis
+    ports:
+      - '5005:5005'
+    environment:
+      POSTGRESQL_USERNAME: memphis
+      POSTGRESQL_PASSWORD: memphis
+      POSTGRESQL_DATABASE: memphis
+      POSTGRESQL_PORT_NUMBER: 5005
+  memphis:
+    image: "memphisos/memphis:latest"
+    depends_on:
+      memphis-metadata:
+        condition: service_healthy
+    healthcheck:
+      test: wget http://127.0.0.1:9000 --spider || exit 1
+      interval: 10s
+      retries: 30
+      start_period: 5s
+    restart: on-failure
+    pull_policy: always
+    networks:
+      - memphis
+    ports:
+      - "9000:9000"
+      - "6666:6666"
+      - "7770:7770"
+    environment:
+      ROOT_PASSWORD: memphis
+      DOCKER_ENV: true
+      ENV: staging
+      USER_PASS_BASED_AUTH: true
+      CONNECTION_TOKEN: memphis
+      METADATA_DB_HOST: memphis-metadata
+      INITIAL_CONFIG_FILE: |
+          users:
+            mgmt:
+            - user: admin
+              password: Admin123456!
+            - user: test_mgmt
+              password: Test123456!
+            - user: test
+              password: Test123456@
+            client:
+            - user: test_app
+              password: Test123456!@
+            - user: test_app2
+              password: Test123456@!
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+
+  memphis-rest-gateway:
+    image: "memphisos/memphis-rest-gateway:latest"
+    depends_on:
+      memphis:
+        condition: service_healthy
+    restart: on-failure
+    pull_policy: always
+    networks:
+      - memphis
+    ports:
+      - "4444:4444"
+    environment:
+      JWT_SECRET: JWT_TEST_PURPOSE
+      REFRESH_JWT_SECRET: REFRESH_JWT_TEST_PURPOSE
+      USER_PASS_BASED_AUTH: true
+      CONNECTION_TOKEN: memphis
+      ROOT_USER: root
+      ROOT_PASSWORD: memphis
+      MEMPHIS_HOST: memphis
+      HTTP_PORT: 4444
+networks:
+  memphis:
+    ipam:
+      driver: default