Development to Master (#141)

--Verification of user roles: Admin roles confirmed before being able to
execute docker commands (i.e. running/stopping container, deleting an
image, etc.) Base user roles can access data on containers but won't be
able to execute commands.

-- Less configuration : Users need not create an env file before running
application. There are, however, multiple new configuration options
where the user can pass environment variables to their docker compose
file, allowing for more flexibility in how the containers are run. These
will be listed in an updated Read Me shortly.

--Updated dashboard: Added new subtitles to Grafana dashboard panels.
Updated plugins to latest version to remove a warning message that may
sometimes appear.

--Code cleanup: Removed many unused files and commented out certain
files that are not currently being used but may be used later.

--Updated published image (docketeerx/docketeer). The newest image has
already been published to the DockerHub registry. Cross-platform
compatibility ensured. Tested on multiple devices without issue.

--Updated docketeerx/postgres image also (new version already published
to registry as well) : Added a few more commands to init sql file for
optimization and republished postgres image after. Users will be
required to have the latest image version to work with the current
version of Docketeer. Please pull the latest image from the registry
(dockteerx/postgres) or rebuild the image locally within the updated
imageConfigs/postgres directory.

Author: kobudnik

.gitignore

@@ -10,6 +10,9 @@ src/database/docketeerdb
 server/database/docketeerdb
 dist/
 .env
+/imageConfigs/grafana/data
+/imageConfigs/prometheus/promData
+/imageConfigs/postgres/docketeerdb
 
 coverage/
 

config.js

@@ -0,0 +1,26 @@
+import dotenv from 'dotenv';
+dotenv.config();
+
+export const POSTGRES_NAME = process.env.DB_NAME
+  ? process.env.DB_CONTAINER_NAME
+  : 'docketeer-db';
+
+export const POSTGRES_USER = process.env.DB_USER
+  ? process.env.DB_USER
+  : 'postgres';
+export const POSTGRES_PASS = process.env.DB_PASS
+  ? process.env.DB_PASS
+  : 'postgres';
+export const POSTGRES_SERVICE = process.env.DB_SERVICE_NAME
+  ? process.env.DB_SERVICE_NAME
+  : 'db';
+export const JWT_SECRET = process.env.JWT_SECRET
+  ? process.env.JWT_SECRET
+  : 'fced686ad3297c774a7c635cc3d7d33421ec0f557fda29510c6c8b7a95736dc36da9064e1fa6963f0069a29a9c1a62d799ce667dece4f3aafe9449aaed2b2302';
+
+export const DASHBOARD_PORT = process.env.REACT_DASHBOARD_PORT
+  ? Number(process.env.DASHBOARD_PORT)
+  : 2999;
+export const DASHBOARD_UID = process.env.REACT_REACT_DASHBOARD_ORG_ID
+  ? Number(process.env.DASHBOARD_ORG_ID)
+  : 1;

docker-compose.yml

@@ -5,14 +5,14 @@ services:
     image: docketeerx/postgres
     restart: always
     ports:
-      - '${POSTGRES_PORT}:5432'
+      - 5432:5432
     volumes:
       - ./imageConfigs/postgres/docketeerdb:/var/lib/postgresql/data/
 
     environment:
-      POSTGRES_DB: ${POSTGRES_NAME}
-      POSTGRES_USER: ${POSTGRES_USER}
-      POSTGRES_PASSWORD: ${POSTGRES_PASS}
+      POSTGRES_DB: 'docketeer-db'
+      POSTGRES_USER: 'postgres'
+      POSTGRES_PASSWORD: 'postgres'
 
   cadvisor:
     image: gcr.io/cadvisor/cadvisor:v0.47.1
@@ -51,8 +51,8 @@ services:
     container_name: prometheus
     ports:
       - '9090:9090'
-
-    #can add volume here to persist the prometheus data.
+    volumes:
+      - ./imageConfigs/prometheus/promData:/prometheus
     depends_on:
       - node-exporter
     labels:
@@ -86,5 +86,3 @@ services:
       - 4000:4000
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
-    # depends_on:
-    #   - grafana

dockerfile

@@ -3,19 +3,18 @@ FROM node
 # Set the working directory to /app
 WORKDIR /app
 
-COPY package*.json ./
-
-# Run npm install to install app dependencies
-RUN npm install
-
-# Set the PATH env variable
-# ENV PATH="/usr/local/bin:${PATH}"
-# COPY /usr/local/bin/docker /usr/local/bin/docker
 ENV DOCKERVERSION=19.03.12
+
 RUN curl -fsSLO https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKERVERSION}.tgz \
   && tar xzvf docker-${DOCKERVERSION}.tgz --strip 1 -C /usr/local/bin docker/docker \
   && rm docker-${DOCKERVERSION}.tgz
 
+
+COPY package*.json ./
+
+# Run npm install to install app dependencies
+RUN npm install
+
 # Copy the current directory contents into the container at /app
 COPY . .
 
@@ -26,3 +25,4 @@ EXPOSE 4000
 CMD ["npm", "start"]
 
 
+