Merge pull request #127 from cisagov/improvement/use-latest-docker-im…

…ages Use the latest Docker images
cisagov · Dec 6, 2022 · 6b63871 · 6b63871
2 parents 4b573ad + 24a73cc
commit 6b63871
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 28 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -12,63 +12,63 @@ secrets:
     file: ./secrets/aws_config
 
 services:
-  redis:
-    image: 'redis:alpine'
-    # ports:
-    #   - target: 6379
-    #     published: 6379
-    #     protocol: tcp
-    #     mode: host
   gather:
-    image: 'cisagov/gatherer:1.5.7'
     depends_on:
       - redis
+    image: 'cisagov/gatherer:1.5.8'
     secrets:
       - source: cyhy_read_creds
         target: database_creds.yml
     volumes:
       - ./output:/home/cisa/shared
-  scan:
-    image: 'cisagov/scanner:1.2.3'
+  pshtt_report:
     depends_on:
       - redis
+    image: 'cisagov/pshtt_reporter:1.2.6'
     secrets:
-      - source: aws_config
-        target: aws_config
-    environment:
-      - AWS_CONFIG_FILE=/run/secrets/aws_config
-      - AWS_PROFILE=lambda
+      - source: scan_read_creds
+        target: scan_read_creds.yml
     volumes:
-      - ./output:/home/scanner/shared
+      - ./output:/home/cisa/shared
+  redis:
+    image: 'redis:alpine'
+    # ports:
+    #   - target: 6379
+    #     published: 6379
+    #     protocol: tcp
+    #     mode: host
   save:
-    image: 'cisagov/saver:1.2.5'
     depends_on:
       - redis
+    image: 'cisagov/saver:1.3.1'
     secrets:
       - source: scan_write_creds
         target: scan_write_creds.yml
     volumes:
-      - ./output:/home/saver/shared
-  trustymail_report:
-    image: 'cisagov/trustymail_reporter:1.4.8'
+      - ./output:/home/cisa/shared
+  scan:
     depends_on:
       - redis
+    environment:
+      - AWS_CONFIG_FILE=/run/secrets/aws_config
+      - AWS_PROFILE=lambda
+    image: 'cisagov/scanner:1.3.2'
     secrets:
-      - source: scan_read_creds
-        target: scan_read_creds.yml
       - source: aws_config
         target: aws_config
-    environment:
-      - AWS_CONFIG_FILE=/run/secrets/aws_config
-      - AWS_PROFILE=elasticsearch
     volumes:
       - ./output:/home/cisa/shared
-  pshtt_report:
-    image: 'cisagov/pshtt_reporter:1.2.5'
+  trustymail_report:
     depends_on:
       - redis
+    environment:
+      - AWS_CONFIG_FILE=/run/secrets/aws_config
+      - AWS_PROFILE=elasticsearch
+    image: 'cisagov/trustymail_reporter:1.4.9'
     secrets:
       - source: scan_read_creds
         target: scan_read_creds.yml
+      - source: aws_config
+        target: aws_config
     volumes:
       - ./output:/home/cisa/shared
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -1,2 +1,3 @@
 --requirement requirements-test.txt
 ipython
+semver
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-1.3.44
+1.3.45