mirror of
https://github.com/netzbegruenung/green-spider.git
synced 2024-05-02 09:04:51 +02:00
Replace 'latest' with 'main' everywhere
This commit is contained in:
parent
a2da4ca0a8
commit
e045d48258
2
Makefile
2
Makefile
|
@ -1,4 +1,4 @@
|
|||
IMAGE := quay.io/netzbegruenung/green-spider:latest
|
||||
IMAGE := quay.io/netzbegruenung/green-spider:main
|
||||
|
||||
DB_ENTITY := spider-results
|
||||
|
||||
|
|
|
@ -68,8 +68,8 @@ docker run --rm -ti \
|
|||
-v $(pwd)/screenshots:/screenshots \
|
||||
-v $(pwd)/volumes/chrome-userdir:/opt/chrome-userdir \
|
||||
--shm-size=2g \
|
||||
quay.io/netzbegruenung/green-spider:latest python3 cli.py \
|
||||
quay.io/netzbegruenung/green-spider:main python3 cli.py \
|
||||
--credentials-path /secrets/datastore-writer.json \
|
||||
--loglevel debug \
|
||||
spider --job '{"url": "https://gruene-porta-westfalica.de/", "city": "Porta Westfalica", "country": "DE", "district": "Minden-Lübbecke", "level": "DE:ORTSVERBAND", "state":" Nordrhein-Westfalen", "type": "REGIONAL_CHAPTER"}'
|
||||
spider --job '{"url": "https://gruene-porta-westfalica.de/home/", "city": "Porta Westfalica", "country": "DE", "district": "Minden-Lübbecke", "level": "DE:ORTSVERBAND", "state":" Nordrhein-Westfalen", "type": "REGIONAL_CHAPTER"}'
|
||||
```
|
||||
|
|
|
@ -15,7 +15,7 @@ services:
|
|||
|
||||
# manager manages the job queue.
|
||||
manager:
|
||||
image: quay.io/netzbegruenung/green-spider:latest
|
||||
image: quay.io/netzbegruenung/green-spider:main
|
||||
command: >
|
||||
python3 cli.py
|
||||
--credentials-path /secrets/datastore-writer.json
|
||||
|
|
2
job.py
2
job.py
|
@ -16,7 +16,7 @@ from google.cloud import datastore
|
|||
# via the environment JOB_TIMEOUT variable.
|
||||
TIMEOUT = int(os.environ.get("JOB_TIMEOUT", "50"))
|
||||
|
||||
DOCKER_IMAGE = 'quay.io/netzbegruenung/green-spider:latest'
|
||||
DOCKER_IMAGE = 'quay.io/netzbegruenung/green-spider:main'
|
||||
|
||||
CREDENTIALS_PATH = '/secrets/datastore-writer.json'
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@ spec:
|
|||
spec:
|
||||
containers:
|
||||
- name: spider
|
||||
image: quay.io/netzbegruenung/green-spider:latest
|
||||
image: quay.io/netzbegruenung/green-spider:main
|
||||
imagePullPolicy: Always
|
||||
args:
|
||||
- "--credentials-path=/secrets/datastore-writer.json"
|
||||
|
|
|
@ -1,36 +0,0 @@
|
|||
apiVersion: batch/v1beta1
|
||||
kind: CronJob
|
||||
metadata:
|
||||
name: green-spider-screenshotter
|
||||
spec:
|
||||
# Saturday at 1:05 UTC
|
||||
schedule: "5 1 * * 6"
|
||||
jobTemplate:
|
||||
spec:
|
||||
parallelism: 1
|
||||
template:
|
||||
spec:
|
||||
containers:
|
||||
- name: screenshotter
|
||||
image: quay.io/netzbegruenung/green-spider-screenshotter:latest
|
||||
imagePullPolicy: Always
|
||||
volumeMounts:
|
||||
- name: secrets
|
||||
mountPath: "/secrets"
|
||||
readOnly: true
|
||||
resources:
|
||||
requests:
|
||||
cpu: 800m
|
||||
memory: 4000M
|
||||
# No restarts, as this would mean to start over.
|
||||
# TODO: Maintain a queue and change this.
|
||||
restartPolicy: Never
|
||||
volumes:
|
||||
- name: secrets
|
||||
secret:
|
||||
secretName: green-spider
|
||||
items:
|
||||
- key: datastore-writer.json
|
||||
path: datastore-writer.json
|
||||
- key: screenshots-uploader.json
|
||||
path: screenshots-uploader.json
|
|
@ -12,7 +12,7 @@ spec:
|
|||
spec:
|
||||
containers:
|
||||
- name: spider
|
||||
image: quay.io/netzbegruenung/green-spider:latest
|
||||
image: quay.io/netzbegruenung/green-spider:main
|
||||
imagePullPolicy: Always
|
||||
args:
|
||||
- "--credentials-path=/secrets/datastore-writer.json"
|
||||
|
|
Loading…
Reference in a new issue