Merge pull request #578 from hackforla/dev

Release update
hackforla · May 6, 2020 · ef1e337 · ef1e337
2 parents 4f1d199 + f3ed52f
commit ef1e337
Show file tree

Hide file tree

Showing 63 changed files with 7,893 additions and 937 deletions.
diff --git a/.github/workflows/Continuous_Delivery.yml b/.github/workflows/Continuous_Delivery.yml
@@ -14,15 +14,8 @@ env:
 jobs:
   build:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version: [11.x]
     steps:
     - uses: actions/checkout@v1
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
-      with:
-        node-version: ${{ matrix.node-version }}
     - name: Rebuild sass
       run: npm rebuild node-sass
     - name: Install Packages

diff --git a/.github/workflows/Continuous_Integration_Frontend.yml b/.github/workflows/Continuous_Integration_Frontend.yml
@@ -4,15 +4,8 @@ on: [pull_request]
 jobs:
   build:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version: [11.x]
     steps:
     - uses: actions/checkout@v1
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
-      with:
-        node-version: ${{ matrix.node-version }}
     - name: Install Packages
       run: npm install
     - name: Lint

diff --git a/.github/workflows/Publish_Frontend_Package.yml b/.github/workflows/Publish_Frontend_Package.yml
@@ -7,15 +7,8 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version: [11.x]
     steps:
     - uses: actions/checkout@v1
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
-      with:
-        node-version: ${{ matrix.node-version }}
     - name: Build and Publish to Registry
       uses: elgohr/Publish-Docker-Github-Action@master
       with:

diff --git a/Orchestration/docker-compose-example.yml b/Orchestration/docker-compose-example.yml
@@ -12,6 +12,7 @@ services:
      PROJECT_URL: REDACTED
      GITHUB_TOKEN: REDACTED
      TOKEN: REDACTED
+     REDIS_URL: redis://redis:6379
    ports:
      - 5000:5000
 
@@ -47,5 +48,21 @@ services:
     container_name: "postgres-dashboard"
     ports:
       - 8080:8080
+
+  redis:
+    build:
+      context: ../redis
+    container_name: "311-redis"
+    expose:
+      - 6379
+
+  rebrow:
+    image: marian/rebrow
+    links:
+      - redis:redis
+    container_name: "redis-dashboard"
+    ports:
+      - 5001:5001
+
 volumes:
   backend_data: