Merge branch 'minor-updates' into 'development'

Making redis port a env variable. Minor updates.

See merge request !8

Dockerfile

@@ -6,7 +6,9 @@ FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 USER 0
 
 # Make sure we are up to date.
-RUN dnf update -y && dnf clean all
+RUN dnf update -y \
+    && dnf clean all \
+    && rm -rf /var/cache/dnf
 
 # Copy in the project files.
 WORKDIR /app
@@ -19,6 +21,7 @@ RUN tar xzf redis-cli.tar.gz && rm redis-cli.tar.gz \
 
 # Set permissions and ownership.
 RUN chown -R 1001 /app \
+    && chown -R 1001 /usr/src \
     && chmod 0555 /app/get-job.sh
 
 # Become the python user.

README.md

@@ -25,6 +25,7 @@ code snippets that were submitted from students through the LEARN application.
 ### Required Environment Variables:
 
 - ```REDIS_HOST``` - The redis server host address.
+- ```REDIS_PORT``` - The redis port number.
 
 ## Local Development Setup
 

hardening_manifest.yaml

@@ -8,7 +8,7 @@ name: "galvanize/galvanize/python-code-evaluator"
 # The most specific version should be the first tag and will be shown
 # on ironbank.dsop.io
 tags:
-- "0.1.1"
+- "0.1.2"
 - "latest"
 
 # Build args passed to Dockerfile ARGs
@@ -23,7 +23,7 @@ labels:
   org.opencontainers.image.licenses: "proprietary"
   org.opencontainers.image.url: "https://www.galvanize.com"
   org.opencontainers.image.vendor: "Galvanize"
-  org.opencontainers.image.version: "0.1.1"
+  org.opencontainers.image.version: "0.1.2"
   mil.dso.ironbank.image.keywords: "lms,learn,galvanize,online,classes,remote,learning"
   mil.dso.ironbank.image.type: "commercial"
   mil.dso.ironbank.product.name: "Learn"
@@ -34,11 +34,11 @@ resources:
     type: s3
     id: galvanize
     region: us-gov-west-1
-  url: s3://learn-dependencies/python-evaluator/redis-cli-0.1.1.tar.gz
+  url: s3://learn-dependencies/python-evaluator/redis-cli-0.1.2.tar.gz
   filename: redis-cli.tar.gz
   validation:
     type: sha256
-    value: 18e1ce8f3a0ecb96746b4540a6067b440f8f3e93b680392f8b13cee021e2cdc3
+    value: 320524af8050b7e7812842e81a89a73d9bd4b2243e63b33ef4a7c91f2b69682d
 
 # List of project maintainers
 maintainers:

scripts/get-job.sh

@@ -12,7 +12,7 @@ while true; do
     # apply the redis commands to block-pop
     # grep out the actual job payload, and
     # write it to the json-object.json file
-    redis-cli -h $REDIS_HOST < redis-cmds | \
+    redis-cli -h $REDIS_HOST -p $REDIS_PORT < redis-cmds | \
         grep 'ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper' > \
         json-object.json
 

scripts/run-local-loop.sh

@@ -10,7 +10,7 @@ while true; do
     # apply the redis commands to block-pop
     # grep out the actual job payload, and
     # write it to the json-object.json file
-    redis-cli -h localhost < redis-cmds | \
+    redis-cli -h localhost -p 6379 < redis-cmds | \
         grep 'ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper' > \
         json-object.json