URBIBBNA-42

Simplify build and dependencies

publish-barshare-gbfs/Dockerfile

@@ -1,18 +1,20 @@
 # This Dockerfile builds a service that regularly publishes the BARShare GBFS to the bbnavi open data portal.
-FROM minio/mc as mc
+FROM python:3-alpine
 
-ENV MOQO_ACCESS_TOKEN=""
-ENV MINIO_ACCESS_KEY="" MINIO_SECRET_KEY=""
-ENV PUBLISH_INTERVAL=""
+RUN apk add --no-cache --update tree minio-cli
 
-RUN apk add --no-cache --update tree
+WORKDIR /usr/src/app
 
-# install MinIO client a.k.a. mc
-COPY --from=mc /usr/bin/mc /usr/bin/mc
+COPY requirements.txt ./
+RUN pip install --no-cache-dir -r requirements.txt
 
 COPY main.sh ./
 COPY index.html barshare-logo.png ./
 
+ENV MOQO_ACCESS_TOKEN=""
+ENV MINIO_ACCESS_KEY="" MINIO_SECRET_KEY=""
+ENV PUBLISH_INTERVAL=""
+
 # prevent inheriting `python` as entrypoint
 ENTRYPOINT []
 

publish-barshare-gbfs/main.sh

@@ -25,7 +25,7 @@ dir="$(mktemp -d -t barshare-gbfs.XXXXXX)"
 
 set -x
 
-mc cp -q index.html barshare-logo.png bbnavi/barshare/
+mcli cp -q index.html barshare-logo.png bbnavi/barshare/
 
 while true; do
 	# We sleep first so that, if the GBFS generation fails contantly, we don't DOS the Moqo API.
@@ -39,5 +39,5 @@ while true; do
 
 	tree -sh "$dir"
 
-	mc cp -q -r $dir/* bbnavi/barshare/
+	mcli cp -q -r $dir/* bbnavi/barshare/
 done