clean up travis scripts

Author: azconger

.travis.yml

@@ -20,16 +20,16 @@ jobs:
         - APP_ID='830780ac-07be-4995-89d4-0645f1f0e95a'
         - APP_HOST='http://vuln-proxy:8020'
         - ENV='travis-ci'
-        - EXEC_CMD='docker-compose --file docker-micro-pg.yml exec vuln-django'
+        - EXEC_CMD='docker-compose --file docker-micro.yml exec vuln-django'
       script:
-        - docker-compose --file docker-micro-pg.yml build
-        - docker-compose --file docker-micro-pg.yml up --detach
+        - docker-compose --file docker-micro.yml build
+        - docker-compose --file docker-micro.yml up --detach
         - scripts/migrations.sh
         - ${EXEC_CMD} python manage.py createsuperuser --no-input
         - ${EXEC_CMD} python manage.py seed polls --number=5
         - ${EXEC_CMD} python manage.py test
       after_success:
-        - docker-compose --file dc-base.yml --file dc-hawkscan.yml up --abort-on-container-exit
-        - docker-compose --file dc-base.yml --file dc-hawkscan.yml down
+        - docker-compose --file docker-micro.yml --file docker-micro-scan.yml up --abort-on-container-exit
+        - docker-compose --file docker-micro.yml --file docker-micro-scan.yml down
       after_failure:
-        - docker-compose --file dc-base.yml --file dc-hawkscan.yml down
+        - docker-compose --file docker-micro.yml --file docker-micro-scan.yml down

Dockerfile

@@ -7,7 +7,6 @@ COPY static/ /opt/app/vuln_django/static
 COPY templates/ /opt/app/vuln_django/templates
 COPY polls/ /opt/app/vuln_django/polls
 COPY manage.py /opt/app/vuln_django/
-COPY scripts /opt/app/vuln_django/scripts
 
 RUN pip install -r /opt/app/requirements.txt
 
@@ -25,7 +24,7 @@ WORKDIR /opt/app/vuln_django
 CMD exec gunicorn vuln_django.wsgi --bind 0.0.0.0:${SERVER_PORT} --workers 3
 
 
-# Create a "dev" stage as the default final build target for legacy integrations.
+# Create a "dev" stage as the default final build target.
 #  - Includes sqlite and nginx
 #  - Runs data migrations and seeds poll data
 FROM base as dev

README.md

@@ -43,8 +43,8 @@ The `docker-micro-pg` Docker Compose configuration builds a microservice version
 
 Build, run, and run data migrations:
 ```shell script
-docker-compose -f docker-micro-pg.yml build
-docker-compose -f docker-micro-pg.yml up --detach
+docker-compose -f docker-micro.yml build
+docker-compose -f docker-micro.yml up --detach
 ./scripts/migrations.sh
 ```
 

docker-hawkscan.yml docker-micro-scan.yml

@@ -7,7 +7,7 @@ services:
     environment:
       - API_KEY=${HAWK_API_KEY}
       - APP_ID=${APP_ID}
-      - APP_ENV="${APP_ENV:-Development}"
+      - APP_ENV="${APP_ENV:-Travis CI}"
       - HOST=${HOST:-http://vuln-proxy:8020}
     volumes:
       - .:/hawk

docker-micro-pg.yml docker-micro.yml

@@ -1,5 +1,5 @@
 # Builds the vuln_django "micro" stage. Adds an Nginx proxy, and a postgres DB.
-# You will need to run migrations manually.
+# You will need to run migrations manually. See README.
 version: "3.7"
 
 services:
@@ -39,12 +39,3 @@ services:
       - POSTGRES_DB=django_db
       - POSTGRES_USER=django_user
       - POSTGRES_PASSWORD=django_password
-
-# To run migrations:
-#   docker-compose exec vuln-django python manage.py migrate
-#
-# To run tests:
-#   docker-compose exec vuln-django python manage.py test
-#
-# To seed the database with random data:
-#   docker-compose exec vuln-django python manage.py seed polls --number=5

scripts/build-and-run.sh

@@ -1,13 +1,13 @@
 #!/usr/bin/env bash
 # Build the vuln-django image "micro" stage and run it with Nginx and PostgreSQL
 set -ex
-source $(dirname $0)/common.sh
+EXEC_CMD='docker-compose --file docker-micro.yml exec vuln-django'
 
 # Build any docker images, in particular the app container
-docker-compose -f docker-micro-pg.yml build
+docker-compose -f docker-micro.yml build
 
 # Launch the app container with Postgres backend and Nginx frontend
-docker-compose -f docker-micro-pg.yml up --detach
+docker-compose -f docker-micro.yml up --detach
 
 # Run data migrations, create admin account, and seed data.
 $(dirname $0)/migrations.sh

scripts/build-and-scan.sh

@@ -1,13 +1,12 @@
 #!/usr/bin/env bash
 # Build the vuln-django image "micro" stage, run it with Nginx and PostgreSQL, and scan it
 set -ex
-source $(dirname $0)/common.sh
 
 # Build vuln-django and run it with Nginx and PostgreSQL
 $(dirname $0)/build-and-run.sh
 
 # Run HawkScan against the app
-docker-compose -f docker-micro-pg.yml -f docker-hawkscan.yml up --abort-on-container-exit
+docker-compose -f docker-micro.yml -f docker-micro-scan.yml up --abort-on-container-exit
 
 # Tear down all containers
-docker-compose -f docker-micro-pg.yml -f docker-hawkscan.yml down
+docker-compose -f docker-micro.yml -f docker-micro-scan.yml down

scripts/cleanup.sh

@@ -2,4 +2,4 @@
 set -ex
 
 # Tear down all containers
-docker-compose -f docker-micro-pg.yml -f docker-hawkscan.yml down --remove-orphans
+docker-compose -f docker-micro.yml -f docker-micro-scan.yml down --remove-orphans

scripts/common.sh

@@ -2,7 +2,7 @@
 # Run database migrations and other setup tasks for the vuln_django "micro" Docker build
 set -ex
 
-EXEC_CMD='docker-compose --file docker-micro-pg.yml exec vuln-django'
+EXEC_CMD='docker-compose --file docker-micro.yml exec vuln-django'
 
 echo Wait for database to become available...
 while ! ${EXEC_CMD} bash -c 'nc -z "${SQL_HOST}" "${SQL_PORT}"'; do

scripts/migrations.sh

@@ -1,3 +1,3 @@
 hawk:
   spider:
-    base: true
+    base: false

stackhawk-travis.yml

@@ -84,8 +84,8 @@
         "NAME": os.environ.get("SQL_DATABASE", os.path.join(BASE_DIR, "db.sqlite3")),
         "USER": os.environ.get("SQL_USER"),
         "PASSWORD": os.environ.get("SQL_PASSWORD"),
-        "HOST": os.environ.get("SQL_HOST", "postgres"),
-        "PORT": os.environ.get("SQL_PORT", "5432"),
+        "HOST": os.environ.get("SQL_HOST"),
+        "PORT": os.environ.get("SQL_PORT"),
     }
 }