Add Prometheus WIP

.circleci/config.yml

@@ -1,9 +1,5 @@
 version: 2.1
 
-orbs:
-  aws-ecr: circleci/aws-ecr@4.0.1
-  aws-ecs: circleci/aws-ecs@0.0.8
-
 workflows:
   build_test_deploy:
     jobs:
@@ -19,7 +15,6 @@ workflows:
                 - master
                 - staging
 
-
 jobs:
   build_test:
     docker:
@@ -46,8 +41,6 @@ jobs:
           command: |
             sudo pip install poetry
             poetry install
-            curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > /usr/local/bin/cc-test-reporter
-            chmod +x /usr/local/bin/cc-test-reporter
 
       - run:
           name: Initializing CodeClimate
@@ -103,10 +96,17 @@ jobs:
             echo ${DOCKER_HUB_PASSWORD} | docker login -u ${DOCKER_HUB_USERNAME} --password-stdin
 
             if [[ "$CIRCLE_BRANCH" == "master" ]]; then
-              docker build -t operationcode/back-end:${CIRCLE_BRANCH}${CIRCLE_WORKFLOW_ID} -t operationcode/back-end:latest -f docker/Dockerfile .
-              docker push operationcode/back-end:latest
+              docker build -f docker/Dockerfile --target Prod \
+                      -t operationcode/back-end:${CIRCLE_BRANCH}-${CIRCLE_WORKFLOW_ID} \
+                      -t operationcode/back-end:master \
+                      -t operationcode/back-end:latest .
             else
-              docker build -t operationcode/back-end:${CIRCLE_BRANCH}${CIRCLE_WORKFLOW_ID} -f docker/Dockerfile --target Staging .
+              docker build -f docker/Dockerfile --target Staging \
+                      -t operationcode/back-end:${CIRCLE_BRANCH}-${CIRCLE_WORKFLOW_ID} \
+                      -t operationcode/back-end:staging \
+                      -t operationcode/back-end:latest .
             fi
 
-            docker push operationcode/back-end:${CIRCLE_BRANCH}${CIRCLE_WORKFLOW_ID}
+            docker push operationcode/back-end:latest
+            docker push operationcode/back-end:${CIRCLE_BRANCH}
+            docker push operationcode/back-end:${CIRCLE_BRANCH}-${CIRCLE_WORKFLOW_ID}

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+custom: https://secure.lglforms.com/form_engine/s/BRtP7QUKyHOyEYsZROsRew

README.md

@@ -22,19 +22,17 @@
 
 
 # Welcome!
-
-This is a work in progress rewrite of the current [OperationCode](https://operationcode.org) backend. 
+This is the back-end application for [OperationCode](https://operationcode.org).
 We highly recommend [joining our organization](https://operationcode.org/join) to receive an invite to our Slack team. 
 From there, you'll want to join the `#oc-python-projects` and `#oc-projects` channels.
 You can get help from multiple professional developers, including people who have worked on the application since day 1!
-Our website is currently served by code located [here](https://github.com/OperationCode/operationcode_backend), 
-but that repository is no longer being actively developed.
+
+Before contributing, please review our [Contributing Guide](CONTRIBUTING.md)
 
 ## Maintainers
 For information about the maintainers of the project, check out [MAINTAINERS.md](MAINTAINERS.md).
 
 ## Quick Start
-
 Recommended versions of tools used within the repo:
 - `python@3.7` or greater (in some environments, you may need to specify version of python i.e. `python test.py` vs `python3 test.py`))
 - `git@2.17.1` or greater

docker/Dockerfile

@@ -39,8 +39,10 @@ ENV PIP_NO_BINARY psycopg2
 
 # copy installed deps from builder image
 COPY --from=builder /opt/venv /opt/venv
-# Add libpq which psycopg2 needs at runtime
+
+# Add libpq and libjpeg which psycopg2 and pillow need at runtime
 RUN apk add --no-cache libpq libjpeg-turbo
+
 # Make sure we use the virtualenv
 ENV PATH="/opt/venv/bin:$PATH"
 
@@ -55,19 +57,6 @@ COPY src /src
 WORKDIR /src
 
 
-# The `dev-base` stage is used as the base for images that require
-# the development dependencies. The duplication of the COPY instruction
-# avoids breaking the cache for that later when the poetry.lock changes
-FROM built-image AS dev-base
-
-ENV DJANGO_ENV development
-COPY poetry.lock pyproject.toml ./
-RUN pip install poetry \
-    && poetry config settings.virtualenvs.create false \
-    && poetry install --no-interaction --no-ansi
-COPY . /
-
-
 # `Shell` will build an image that, when run, drops you into a
 # python shell with the application context loaded
 # Note this stage name is capitalised, this is purely
@@ -78,34 +67,45 @@ LABEL shell=true
 CMD python manage.py shell
 
 
-# `Dev` runs the application using the development web server, and enables
-# developer tools like the debugger and interactive expcetions
-FROM dev-base AS Dev
-LABEL dev=true
-EXPOSE 8000
-WORKDIR /src
-
-CMD python manage.py collectstatic --no-input;\
-    gunicorn operationcode_backend.wsgi -b 0.0.0.0:8000 -w 3 --access-logfile=- --error-logfile=- --capture-output --logger-class "operationcode_backend.custom_logging.CustomGunicornLogger"
-
 # The `Staging` stage is the same configuration as prod, the only
 # difference being it doesn't process background tasks
 # The resulting image will run the application using a
-# production webserver and configuration
+# production webserver and the `environments/staging.py` configuration
 FROM app As Staging
 
 ENV DJANGO_ENV staging
 EXPOSE 8000
-CMD python manage.py collectstatic --no-input;\
-    gunicorn operationcode_backend.wsgi -b 0.0.0.0:8000 -w 3 --access-logfile=- --error-logfile=- --capture-output --logger-class "operationcode_backend.custom_logging.CustomGunicornLogger"
+CMD gunicorn operationcode_backend.wsgi -b 0.0.0.0:8000 -w 3 --access-logfile=- --error-logfile=- --capture-output --logger-class "operationcode_backend.custom_logging.CustomGunicornLogger"
 
-# The `Prod` stage is the default stage if the Dockerfile is run without
-# a target stage set. The resulting image will run the application using a
-# production webserver and configuration
+# The `Prod` stage creates an image that will run the application using a
+# production webserver and the `environments/production.py` configuration
 FROM app As Prod
 
 ENV DJANGO_ENV production
 EXPOSE 8000
+CMD python manage.py process_tasks &\
+    gunicorn operationcode_backend.wsgi -b 0.0.0.0:8000 -w 3 --access-logfile=- --error-logfile=- --capture-output --logger-class "operationcode_backend.custom_logging.CustomGunicornLogger"
+
+
+# The `dev-base` stage is used as the base for images that require
+# the development dependencies. The duplication of the COPY instruction
+# avoids breaking the cache for that later when the poetry.lock changes
+FROM built-image AS dev-base
+
+ENV DJANGO_ENV development
+COPY poetry.lock pyproject.toml ./
+RUN pip install poetry \
+    && poetry config settings.virtualenvs.create false \
+    && poetry install --no-interaction --no-ansi
+COPY . /
+
+# The `Dev` stage is the default stage if the Dockerfile is run without a target stage set.
+# It runs the application using the development web server, and enables
+# developer tools like the debugger and interactive expcetions
+FROM dev-base AS Dev
+LABEL dev=true
+EXPOSE 8000
+WORKDIR /src
+
 CMD python manage.py collectstatic --no-input;\
-    python manage.py process_tasks &\
     gunicorn operationcode_backend.wsgi -b 0.0.0.0:8000 -w 3 --access-logfile=- --error-logfile=- --capture-output --logger-class "operationcode_backend.custom_logging.CustomGunicornLogger"

docker/docker-compose.yml

@@ -6,45 +6,17 @@ services:
     build:
       context: ..
       dockerfile: docker/Dockerfile
-#      target: Dev
+      target: Staging
     container_name: backend02
     env_file:
       - .env
-#    volumes:
-#      - ../src:/src
     ports:
       - 8000:8000
-  #    depends_on:
-  #      - db
-
 
   pybot:
     image: pybot:latest
     container_name: pybot01
     env_file:
       - pybot.env
     ports:
-      - 5000:5000
-
-
-
-  ngrok-pyback:
-    image: wernight/ngrok:latest
-    env_file:
-      - .ngrok.env
-    environment:
-      - NGROK_PORT=backend:8000
-      - NGROK_SUBDOMAIN=pyback
-    ports:
-      - 4040:4040
-
-#  db:
-#    image: postgres:10.1-alpine
-#    container_name: pg01
-#    ports:
-#      - 5434:5432
-#    volumes:
-#      - postgres_data:/var/lib/postgresql/data/
-
-#volumes:
-#  postgres_data:
+      - 5000:5000