run planet from dockerized containers, unblock dist upgrade

Author: ewdurbin

pillar/base/planet.sls

@@ -3,5 +3,13 @@ planet:
     - planetpython.org
     - www.planetpython.org
   sites:
-    planetpython.org:
+    planetpython:
+      cache: /srv/cache/
+      output: /srv/planetpython.org/
+      image: ghcr.io/python/planetpython:latest
+      config: config.ini
+    planetpython-3:
+      cache: /srv/cache3/
+      output: /srv/planetpython.org/3/
+      image: ghcr.io/python/planetpython-3:latest
       config: config.ini

salt/planet/config/run-planet.sh.jinja

@@ -1,5 +1,10 @@
 cd /srv/planet/
 git pull
-{% for site in salt["pillar.get"]("planet", {}).get("sites").values() %}
-$(which python2.7) /srv/planet/code/planet.py /srv/planet/config/{{ site["config"] }}
+{% for site, site_config in salt["pillar.get"]("planet", {}).get("sites").items() %}
+docker run --rm -it \
+  -v {{ site_config["cache"] }}:/srv/cache/ \
+  -v {{ site_config["output"] }}:/srv/planetpython.org/ \
+  -v /srv/planet/config/{{ site_config["config"] }}:/planet/config/config.ini \
+  {{ site_config["image"] }} \
+  python /planet/code/planet.py /planet/config/config.ini
 {% endfor %}

salt/planet/init.sls

@@ -4,10 +4,20 @@ include:
 git:
   pkg.installed
 
+docker.io:
+  pkg.installed
+docker:
+  service.running:
+    - enable: True
+
 planet-user:
   user.present:
     - name: planet
     - createhome: False
+    - groups:
+      - docker
+    - require:
+      - pkg: docker.io
 
 /etc/nginx/sites.d/planet.conf:
   file.managed:
@@ -40,7 +50,7 @@ planet-user:
 
 https://github.com/python/planet:
   git.latest:
-    - branch: py2
+    - branch: main
     - target: /srv/planet/
     - user: planet
     - require: