setop/mobilizon_instances
1
0
Fork 0
Code Activity

chore(build): deploy version 0.2.1

Browse Source
This commit is contained in:
setop
2025-09-02 21:27:49 +02:00
parent 24ecbcafc0
commit 34f4b0559b
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Dockerfile
View File

@@ -10,15 +10,15 @@ COPY ./s6 /etc/s6
WORKDIR /app WORKDIR /app
RUN wget -q https://github.com/sqlpage/SQLPage/releases/download/v0.36.1/sqlpage-aws-lambda.zip \
&& unzip sqlpage-aws-lambda.zip bootstrap \
&& rm sqlpage-aws-lambda.zip
COPY scripts scripts COPY scripts scripts
COPY src src COPY src src
COPY sqlpage sqlpage COPY sqlpage sqlpage
COPY webroot webroot COPY webroot webroot
RUN wget -q https://github.com/sqlpage/SQLPage/releases/download/v0.35.2/sqlpage-aws-lambda.zip \
&& unzip sqlpage-aws-lambda.zip bootstrap \
&& rm sqlpage-aws-lambda.zip
ENTRYPOINT [ "/usr/bin/s6-svscan", "/etc/s6" ] ENTRYPOINT [ "/usr/bin/s6-svscan", "/etc/s6" ]
EXPOSE 8080 EXPOSE 8080

2
cmd.txt
View File

@@ -1,6 +1,6 @@
. .venv/bin/activate . .venv/bin/activate
export VERSION=0.2.0 export VERSION=0.2.1
docker build -t mobilizon-instances:${VERSION} . docker build -t mobilizon-instances:${VERSION} .

2
docker-compose.template.yml
View File

@@ -3,7 +3,7 @@
services: services:
web: web:
restart: unless-stopped restart: unless-stopped
image: mobilizon-instances:0.1.0 image: mobilizon-instances:0.2.1
environment: environment:
SQLPAGE_ENVIRONMENT: production SQLPAGE_ENVIRONMENT: production
SQLPAGE_WEB_ROOT: /app/webroot SQLPAGE_WEB_ROOT: /app/webroot

2
src/instances.py
View File

@@ -12,12 +12,14 @@ logger = logging.getLogger(__name__)
UA = 'Mozilla/5.0 (X11; Linux x86_64; rv:139.0) Gecko/20100101 Firefox/139.0' UA = 'Mozilla/5.0 (X11; Linux x86_64; rv:139.0) Gecko/20100101 Firefox/139.0'
def yield_from_joinmbz(): def yield_from_joinmbz():
# IMPROVE split into Scrapy.Request and callback function
# load from jmbz api # load from jmbz api
import requests import requests
url = 'https://instances.joinmobilizon.org/api/v1/instances?start=0&count=1000' url = 'https://instances.joinmobilizon.org/api/v1/instances?start=0&count=1000'
joinres = requests.get(url, headers={'user-agent': UA}).json().get('data') joinres = requests.get(url, headers={'user-agent': UA}).json().get('data')
# load from db # load from db
with sqlite3.connect(f'{os.environ.get("DATADIR")}/sqlpage.db', timeout=15.0, isolation_level='IMMEDIATE') as db: with sqlite3.connect(f'{os.environ.get("DATADIR")}/sqlpage.db', timeout=15.0, isolation_level='IMMEDIATE') as db:
# IMPROVE do it purely in SQL using conflict clause or where clause
rows = db.execute('select rowid, domain from instances').fetchall() rows = db.execute('select rowid, domain from instances').fetchall()
max_rowid = max(row[0] for row in rows) max_rowid = max(row[0] for row in rows)
domains = {row[1] for row in rows} domains = {row[1] for row in rows}