Merge pull request #157 from guydavis/develop

Final changelog before v0.5.0 release.

CHANGELOG.md

@@ -2,10 +2,11 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [0.5.0] - 2021-07-?
+## [0.5.0] - 2021-07-09
 
-- Plotting and farming on the [Flax Network](https://github.com/guydavis/machinaris/issues/105). Enabled by default, but can be [disabled](https://github.com/guydavis/machinaris/wiki/Flax#optional-to-disable).
 - Support for [official Chia pools](https://github.com/guydavis/machinaris/issues/131). Chia and Madmax plotters can create portable plots.
+- Plotting and farming on the [Flax Network](https://github.com/guydavis/machinaris/issues/105). Enabled by default, but can be [disabled](https://github.com/guydavis/machinaris/wiki/Flax#optional-to-disable).
+
 
 ## [0.4.0] - 2021-06-25
 

README.md

@@ -1,6 +1,6 @@
 # machinaris
 
-A Docker image for plotting and farming the Chia™ cryptocurrency on [one computer](https://github.com/guydavis/machinaris/wiki/Docker) or across [many](https://github.com/guydavis/machinaris/wiki/Workers).
+A Docker image for plotting and farming the Chia™ cryptocurrency on [one computer](https://github.com/guydavis/machinaris/wiki/Docker) or across [many](https://github.com/guydavis/machinaris/wiki/Workers). Now with [official Pool support](https://github.com/guydavis/machinaris/wiki/Pooling)!
 
 ![Home](https://raw.githubusercontent.com/guydavis/machinaris-unraid/master/docs/img/machinaris_home.png)
 

dockerfile

@@ -84,7 +84,7 @@ ENV plots_dir="/plots"
 # One of fullnode, farmer, harvester, plotter, farmer+plotter, harvester+plotter. Default is fullnode
 ENV mode="fullnode" 
 # Required is the 'chia' blockchain, but can optionally add 'flax' too. A comma-separated list.
-ENV blockchains="chia"
+ENV blockchains="chia,flax"
 # If provided then these optional 3 public keys will be set in your plotman.yaml
 ENV farmer_pk="null"
 ENV pool_pk="null"

web/templates/plotting.html

@@ -28,7 +28,11 @@
 </script>
 
 <header class="pb-3 mb-4 border-bottom">
-    <span class="fs-4">Plotting Status: {{ plotting.display_status }}</span>
+    <span class="fs-4">Plotting Status: {{ plotting.display_status }}
+        {% if plotting.display_status == 'Active' %}
+            - {{ plotting.rows|length }} jobs.
+        {% endif %}
+    </span>
 </header>
 
 <div class="modal fade" id="killModal" tabindex="-1" aria-labelledby="killModalLabel" aria-hidden="true">