Merge branch '6.0.x' into development

.github/workflows/deployment.yml

@@ -33,9 +33,9 @@ jobs:
           tags: |
             type=ref,event=tag
             type=ref,event=branch
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
+            type=semver,pattern=prod-{{version}}
+            type=semver,pattern=prod-{{major}}.{{minor}}
+            type=semver,pattern=prod-{{major}}
       - name: Build and push overseer
         id: docker_build
         uses: docker/build-push-action@v2

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [6.0.0](https://github.com/macite/doubtfire-deploy/compare/v5.0.8...v6.0.0) (2022-02-02)
+
+
+### Features
+
+* update overseer to ruby 3.1 ([f1bf9f7](https://github.com/macite/doubtfire-deploy/commit/f1bf9f71ed78a7fc6efb0f5f6e858d2f6c336829))
+
 ### [5.0.6](https://github.com/macite/doubtfire-deploy/compare/v5.0.5...v5.0.6) (2021-12-06)
 
 ### [5.0.5](https://github.com/macite/doubtfire-deploy/compare/v5.0.4...v5.0.5) (2021-11-19)

CONTRIBUTING.md

@@ -0,0 +1,19 @@
+![Doubtfire Logo](http://puu.sh/lyClF/fde5bfbbe7.png)
+
+# Contributing to Doubtfire Overseer
+
+We welcome additions and extensions to Doubtfire that help progress our goal of supporting student learning through frequent formative feedback and delayed summative assessment.
+
+This guide provides high-level details on how to contribute to the Doubtfire Overseer repository.
+
+Before continuing, **please read the [contributing document](https://github.com/doubtfire-lms/doubtfire-deploy/blob/development/CONTRIBUTING.md)**, as this outlines the Git workflow you should be following.
+
+## Table of Contents
+
+- [Contributing to Doubtfire Overseer](#contributing-to-doubtfire-overseer)
+  - [Table of Contents](#table-of-contents)
+  - [Project Structure](#project-structure)
+
+## Project Structure
+
+Coming - basically RAbbitMq input, launch Docker, collect response, return via RabbitMq,

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.6.7-buster
+FROM ruby:3.1-buster
 
 # docker-ce-cli apt dependencies
 ENV DEBIAN_FRONTEND noninteractive

Gemfile

@@ -2,7 +2,7 @@
 
 source 'http://rubygems.org'
 
-ruby '~> 2.6.6'
+ruby '~> 3.1.0'
 
 gem 'bunny', '>= 2.14.1'
 gem 'bunny-pub-sub', '0.5.2'

README.md

@@ -15,7 +15,7 @@
   ```
 
   * `RABBITMQ_HOSTNAME`, `RABBITMQ_USERNAME`, and `RABBITMQ_PASSWORD` provide details needed to access the rabbitmq.
-  * `HOST_XFS_VOLUME` is the path to the location where overseer containers will store their work. When multiple overseer instances are run this path needs to be unique for each instance. Overseer will create `sandbox` and `output` folders in this location.
+  * `HOST_XFS_VOLUME` is a path on the host that will run the automated code. This needs to refer to the location where overseer containers will store their work. Overseer uses this to setup a volume in each container it creates. When multiple overseer instances are run this path needs to be unique for each instance. Overseer will create `sandbox` and `output` folders in this location.
   * `CONTAINER_NAME` is optional (defaults to `overseer-container`) and provides the name of the container that overseer creates. If there are multiple overseer instances then they must have unique container names.
 
 * Easiest option is to setup rabbitmq alongside overseer in the same docker network, and have it setup to run with the management interface.

overseer_receive_action.rb

@@ -100,7 +100,7 @@ def extract_zip(input_zip_file_path, output_loc, flatten = false, override = fal
           pn = File.join(output_loc, entry.name)
         end
         override_msg = ''
-        if File.exists?(pn)
+        if File.exist?(pn)
           if override
             FileUtils.rm_f(pn)
             override_msg = ' OVERIDE'
@@ -362,11 +362,11 @@ def receive(subscriber_instance, channel, results_publisher, delivery_info, _pro
     cleanup_docker_workdir
   end
 
-  if File.exists? docker_execdir_path
+  if File.exist? docker_execdir_path
     FileUtils.rm_rf docker_execdir_path
   end
 
-  if File.exists? docker_outdir_path
+  if File.exist? docker_outdir_path
     FileUtils.rm_rf docker_outdir_path
   end
 
@@ -375,9 +375,9 @@ def receive(subscriber_instance, channel, results_publisher, delivery_info, _pro
   FileUtils.mkdir_p docker_outdir_path
 
   # Clean any output txt and yaml if present
-  FileUtils.mkdir_p(output_path) unless File.exists?(output_path)
-  FileUtils.rm("#{output_path}/output.txt") if File.exists?("#{output_path}/output.txt")
-  FileUtils.rm("#{output_path}/output.yaml") if File.exists?("#{output_path}/output.yaml")
+  FileUtils.mkdir_p(output_path) unless File.exist?(output_path)
+  FileUtils.rm("#{output_path}/output.txt") if File.exist?("#{output_path}/output.txt")
+  FileUtils.rm("#{output_path}/output.yaml") if File.exist?("#{output_path}/output.yaml")
 
 
   skip_rm = params['skip_rm'] || 0