8000 run planet from dockerized containers, unblock dist upgrade (#568) · python/psf-salt@6ca95ca · GitHub
[go: up one dir, main page]
Skip to content

Commit 6ca95ca

Browse files
ewdurbinewdurbin
authored
run planet from dockerized containers, unblock dist upgrade (#568)
* run planet from dockerized containers, unblock dist upgrade * configure site caches/outputs separately
1 parent 560e74d commit 6ca95ca

File tree

3 files changed

+36
-14
lines changed

3 files changed

+36
-14
lines changed

‎pillar/base/planet.sls

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,13 @@ planet:
33
- planetpython.org
44
- www.planetpython.org
55
sites:
6-
planetpython.org:
6+
planetpython:
7+
cache: /srv/cache/
8+
output: /srv/planetpython.org/
9+
image: ghcr.io/python/planetpython:latest
10+
config: config.ini
11+
planetpython-3:
12+
cache: /srv/cache3/
13+
output: /srv/planetpython.org/3/
14+
image: ghcr.io/python/planetpython-3:latest
715
config: config.ini

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
cd /srv/planet/
22
git pull
3-
{% for site in salt["pillar.get"]("planet", {}).get("sites").values() %}
4-
$(which python2.7) /srv/planet/code/planet.py /srv/planet/config/{{ site["config"] }}
3+
{% for site, site_config in salt["pillar.get"]("planet", {}).get("sites").items() %}
4+
docker run --rm -it \
5+
-v {{ site_config["cache"] }}:/srv/cache/ \
6+
-v {{ site_config["output"] }}:/srv/planetpython.org/ \
7+
-v /srv/planet/config/{{ site_config["config"] }}:/planet/config/config.ini \
8+
{{ site_config["image"] }} \
9+
python /planet/code/planet.py /planet/config/config.ini
510
{% endfor %}

‎salt/planet/init.sls

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,20 @@ include:
44
git:
55
pkg.installed
66

7+
docker.io:
8+
pkg.installed
9+
docker:
10+
service.running:
11+
- enable: True
12+
713
planet-user:
814
user.present:
915
- name: planet
1016
- createhome: False
17+
- groups:
18+
- docker
19+
- require:
20+
- pkg: docker.io
1121

1222
/etc/nginx/sites.d/planet.conf:
1323
file.managed:
@@ -40,20 +50,14 @@ planet-user:
4050

4151
https://github.com/python/planet:
4252
git.latest:
43-
- branch: py2
53+
- branch: main
4454
- target: /srv/planet/
4555
- user: planet
4656
- require:
4757
- user: planet-user
4858
- pkg: git
4959
- file: /srv/planet/
5060

51-
/srv/cache/:
52-
file.directory:
53-
- user: planet
54-
- group: planet
55-
- mode: "0770"
56-
5761
/srv/run-planet.sh:
5862
file.managed:
5963
- source: salt://planet/config/run-planet.sh.jinja
@@ -67,18 +71,23 @@ https://github.com/python/planet:
6771
- minute: 37
6872
- hour: 1,4,7,10,13,16,19,21
6973

70-
{% for site in salt["pillar.get"]("planet", {}).get("sites", []) %}
71-
/srv/{{ site }}/:
74+
{% for site, site_config in salt["pillar.get"]("planet", {}).get("sites", {}).items() %}
75+
{{ site_config["cache"] }}:
76+
file.directory:
77+
- user: planet
78+
- group: planet
79+
- mode: "0755"
80+
{{ site_config["output"] }}:
7281
file.directory:
7382
- user: planet
7483
- group: planet
7584
- mode: "0755"
76-
/srv/{{ site }}/static:
85+
{{ site_config["output"] }}/static:
7786
file.symlink:
7887
- target: /srv/planet/static
7988
- user: planet
8089
- group: planet
8190
- mode: "0644"
8291
- require:
83-
- file: /srv/{{ site }}/
92+
- file: {{ site_config["output"] }}
8493
{% endfor %}

0 commit comments

Comments
 (0)
0