Merge pull request #73 from marblestation/protobuf_dockerfile_update

Updated protobuf to 3.17.3 + fixed Dockerfile
adsabs · May 13, 2022 · 7729986 · 7729986
2 parents a7227d0 + dcbd24c
commit 7729986
Show file tree

Hide file tree

Showing 15 changed files with 94 additions and 90 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -9,9 +9,9 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
 # - Compile and install protobuf
 RUN \
     DEBIAN_FRONTEND=noninteractive apt-get install -y autoconf automake libtool curl make g++ unzip wget && \
-    wget https://github.com/google/protobuf/releases/download/v3.11.3/protobuf-python-3.11.3.tar.gz && \
-    tar -zxvf protobuf-python-3.11.3.tar.gz && \
-    cd protobuf-3.11.3/ && \
+    wget https://github.com/google/protobuf/releases/download/v3.17.3/protobuf-python-3.17.3.tar.gz && \
+    tar -zxvf protobuf-python-3.17.3.tar.gz && \
+    cd protobuf-3.17.3/ && \
     ./configure && \
     make -j 2 && \
     make install && \
@@ -23,7 +23,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y git curl wget nano vim les
 # - Python 2 & 3
 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential libpq-dev libxslt1-dev poppler-utils
 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y python2 python2-dev python-setuptools python-libxml2
-RUN curl https://bootstrap.pypa.io/get-pip.py --output /tmp/get-pip.py && \
+RUN curl https://bootstrap.pypa.io/pip/2.7/get-pip.py --output /tmp/get-pip.py && \
         python2 /tmp/get-pip.py && \
         rm -f /tmp/get-pip.py
 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y python3 python3-dev python3-pip python3-setuptools python3-libxml2

diff --git a/README.md b/README.md
@@ -15,9 +15,9 @@ To modify message definition, Protocol Buffers compiler should be installed:
 
 ```
 sudo apt-get install autoconf automake libtool curl make g++ unzip
-wget https://github.com/google/protobuf/releases/download/v3.3.0/protobuf-python-3.3.0.tar.gz
-tar -zxvf protobuf-python-3.3.0.tar.gz
-cd protobuf-3.3.0/
+wget https://github.com/google/protobuf/releases/download/v3.17.3/protobuf-python-3.17.3.tar.gz
+tar -zxvf protobuf-python-3.17.3.tar.gz
+cd protobuf-3.17.3/
 ./configure
 make
 sudo make install

diff --git a/adsmsg/protobuf/augmentrecord_pb2.py b/adsmsg/protobuf/augmentrecord_pb2.py
diff --git a/adsmsg/protobuf/bibrecord_pb2.py b/adsmsg/protobuf/bibrecord_pb2.py
diff --git a/adsmsg/protobuf/citation_changes_content_type_pb2.py b/adsmsg/protobuf/citation_changes_content_type_pb2.py
diff --git a/adsmsg/protobuf/citation_changes_pb2.py b/adsmsg/protobuf/citation_changes_pb2.py
diff --git a/adsmsg/protobuf/denormalized_record_pb2.py b/adsmsg/protobuf/denormalized_record_pb2.py
diff --git a/adsmsg/protobuf/fulltext_requests_pb2.py b/adsmsg/protobuf/fulltext_requests_pb2.py
diff --git a/adsmsg/protobuf/fulltext_update_pb2.py b/adsmsg/protobuf/fulltext_update_pb2.py
diff --git a/adsmsg/protobuf/master_pb2.py b/adsmsg/protobuf/master_pb2.py
diff --git a/adsmsg/protobuf/metrics_pb2.py b/adsmsg/protobuf/metrics_pb2.py
diff --git a/adsmsg/protobuf/nonbibrecord_pb2.py b/adsmsg/protobuf/nonbibrecord_pb2.py
diff --git a/adsmsg/protobuf/orcid_claims_pb2.py b/adsmsg/protobuf/orcid_claims_pb2.py
diff --git a/adsmsg/protobuf/status_pb2.py b/adsmsg/protobuf/status_pb2.py
diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,3 @@
-protobuf==3.14.0
+protobuf==3.17.3
 future==0.18.2
 simplejson==3.17.6