From 072ea8c16034b2ff2ff4265febd5d3ba272e7b4f Mon Sep 17 00:00:00 2001 From: Michael Uranaka Date: Thu, 20 May 2021 16:49:43 -1000 Subject: [PATCH] minor updates to container --- Dockerfile | 1 + README.md | 1 + hardening_manifest.yaml | 12 ++++++------ scripts/get-job.sh | 2 +- scripts/run-local-loop.sh | 2 +- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 56bbcd2..f687bed 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,6 +24,7 @@ RUN tar xzf redis-cli.tar.gz \ && mv redis-cli /usr/local/bin/redis-cli \ && tar xzf libs.tar.gz && rm libs.tar.gz \ && chown -R 1000 /app \ + && chown -R 1000 /usr/src \ && chmod 0555 /app/get-job.sh # Change to the gradle user. diff --git a/README.md b/README.md index c9d36b4..70982a2 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,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 diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 3263d61..e93e837 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -8,7 +8,7 @@ name: "galvanize/galvanize/java-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,20 +34,20 @@ resources: type: s3 id: galvanize region: us-gov-west-1 - url: s3://learn-dependencies/java-evaluator/redis-cli-0.1.1.tar.gz + url: s3://learn-dependencies/java-evaluator/redis-cli-0.1.2.tar.gz filename: redis-cli.tar.gz validation: type: sha256 - value: 83794cbb0627b49227529a3487cc89d663d6145487207be8afe703b243eb7a46 + value: d1bbce51621f3f77065b9deed213f503fe887c722780ebcadd7d267ce2b5c948 - auth: type: s3 id: galvanize region: us-gov-west-1 - url: s3://learn-dependencies/java-evaluator/libs-0.1.1.tar.gz + url: s3://learn-dependencies/java-evaluator/libs-0.1.2.tar.gz filename: libs.tar.gz validation: type: sha256 - value: 8cda068a495ec2fba4b9f79af5f886db9da9b11d697f6e76eb615f54f829dac9 + value: f07a36e8340771879de880752c736138ea64d3166cdb414ed5646473fd3ec1db # List of project maintainers maintainers: diff --git a/scripts/get-job.sh b/scripts/get-job.sh index 8ded423..9d108cd 100755 --- a/scripts/get-job.sh +++ b/scripts/get-job.sh @@ -17,7 +17,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 diff --git a/scripts/run-local-loop.sh b/scripts/run-local-loop.sh index a8428ce..7546602 100755 --- a/scripts/run-local-loop.sh +++ b/scripts/run-local-loop.sh @@ -17,7 +17,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 -- GitLab