# HG changeset patch
# User drewp@bigasterisk.com
# Date 1627768765 25200
# Node ID 8122ff3b0fe5f0acacf977457b0c7f011eb0457e
# Parent  9eb6b4806272fc7ca89ea5d204c8a462f278b485
fix dns and other deps

diff -r 9eb6b4806272 -r 8122ff3b0fe5 Dockerfile
--- a/Dockerfile	Mon Feb 08 16:40:47 2021 -0800
+++ b/Dockerfile	Sat Jul 31 14:59:25 2021 -0700
@@ -7,17 +7,12 @@
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata
 
+RUN apt-get install -y python3-pip git curl
 
 WORKDIR /opt
 
-RUN apt-get install -y python3-pip
-RUN apt-get install -y git
-
-
 COPY requirements.txt ./
 RUN pip3 install --index-url https://projects.bigasterisk.com/ --extra-index-url https://pypi.org/simple -r requirements.txt
-# not sure why this doesn't work from inside requirements.txt
-#RUN pip3 install --index-url https://projects.bigasterisk.com/ --extra-index-url https://pypi.org/simple -U 'https://github.com/drewp/cyclone/archive/python3.zip?v2'
 
 COPY *.py *.conf *.html *.json ./
 COPY credentials credentials
diff -r 9eb6b4806272 -r 8122ff3b0fe5 gcalendarwatch.py
--- a/gcalendarwatch.py	Mon Feb 08 16:40:47 2021 -0800
+++ b/gcalendarwatch.py	Sat Jul 31 14:59:25 2021 -0700
@@ -402,6 +402,14 @@
 
     verboseLogging(args['--verbose'])
 
+    # fix for oauth2.googleapis.com resolving to the wrong thing and
+    # making a self-signed cert error
+    with open('/etc/resolv.conf', 'w') as resolv:
+        resolv.write('''
+nameserver 10.43.0.10
+search default.svc.cluster.local
+        ''')
+
     agendaGraph = PatchableGraph()  # next few days
     countdownGraph = PatchableGraph()  # next n of starred events
     conf = json.load(open("gcalendarwatch.conf"))
diff -r 9eb6b4806272 -r 8122ff3b0fe5 requirements.txt
--- a/requirements.txt	Mon Feb 08 16:40:47 2021 -0800
+++ b/requirements.txt	Sat Jul 31 14:59:25 2021 -0700
@@ -1,19 +1,13 @@
-#google-auth-httplib2==0.0.4
-#google_auth_oauthlib==0.4.1
-google-api-python-client==1.11.0
-#google-auth==1.21.1
+cyclone==1.3
+docopt==0.6.2
+gcsa==1.2.0
+google-api-python-client==2.15.0
 oauth2client==4.1.3
-#oauthlib==3.1.0
-gcsa==0.3.2
-
-prometheus_client==0.8.0
+prometheus_client==0.11.0
 pymongo==3.11.0
 python-dateutil==2.8.1
 rdflib==4.2.2
-Twisted[tls]==20.3.0
-docopt==0.6.2
-
-https://github.com/drewp/cyclone/archive/python3.zip
+#Twisted[tls]==21.7.0
 
 cycloneerr
 patchablegraph==0.11.0