Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[infra] upgrade python #9532

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

[infra] upgrade python #9532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9aa596d
upgrade python
jonathanmetzman Jan 30, 2023
7aa61e1
fix airflow
jonathanmetzman Jan 31, 2023
356599b
try
jonathanmetzman Jan 31, 2023
9009bfa
hold back
jonathanmetzman Feb 7, 2023
28dff49
Hold projects back
jonathanmetzman Feb 7, 2023
a333b02
fix
jonathanmetzman Feb 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions infra/base-images/base-builder/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ FROM gcr.io/oss-fuzz-base/base-clang
COPY install_deps.sh /
RUN /install_deps.sh && rm /install_deps.sh

# Build and install latest Python 3 (3.8.3).
ENV PYTHON_VERSION 3.8.3
# Build and install latest Python 3 (3.10.8).
ENV PYTHON_VERSION 3.10.8
RUN export PYTHON_DEPS="\
zlib1g-dev \
libncurses5-dev \
Expand Down
2 changes: 1 addition & 1 deletion projects/airflow/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ pip3 install .

# Build fuzzers in $OUT.
cd $SRC
compile_python_fuzzer dag_fuzz.py --add-data airflow:airflow --add-data airflow/airflow:airflow --add-data /usr/local/lib/python3.8/site-packages/cron_descriptor:cron_descriptor
compile_python_fuzzer dag_fuzz.py --add-data airflow:airflow --add-data airflow/airflow:airflow --add-data /usr/local/lib/python3.10/site-packages/cron_descriptor:cron_descriptor
2 changes: 1 addition & 1 deletion projects/cel-cpp/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

FROM gcr.io/oss-fuzz-base/base-builder

RUN apt-get update && apt-get install python openjdk-11-jdk -y
RUN apt-get update && apt-get install python python3 openjdk-11-jdk -y
RUN git clone --depth 1 https://github.com/google/cel-cpp/
COPY build.sh $SRC/
RUN mkdir $SRC/cel-cpp/fuzz/
Expand Down
2 changes: 1 addition & 1 deletion projects/http-pattern-matcher/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
FROM gcr.io/oss-fuzz-base/base-builder
MAINTAINER nareddyt@google.com

RUN apt-get update && apt-get install python -y
RUN apt-get update && apt-get install python python3 -y
RUN git clone https://github.com/google/http_pattern_matcher.git
WORKDIR $SRC/http_pattern_matcher/
COPY build.sh $SRC/
4 changes: 2 additions & 2 deletions projects/proto-plus-python/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
FROM gcr.io/oss-fuzz-base/base-builder-python
# limitations under the License
gcr.io/oss-fuzz-base/base-builder-python@sha256:254ba32c9e5a630865d0a4121fbe53ff7ba8c8394901005674ffa3de17efcd18
RUN git clone https://github.com/googleapis/proto-plus-python proto-plus-python
COPY *.sh *py $SRC/
WORKDIR $SRC/proto-plus-python
2 changes: 1 addition & 1 deletion projects/pycrypto/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#
################################################################################

FROM gcr.io/oss-fuzz-base/base-builder-python
FROM gcr.io/oss-fuzz-base/base-builder-python@sha256:254ba32c9e5a630865d0a4121fbe53ff7ba8c8394901005674ffa3de17efcd18
RUN git clone https://github.com/pycrypto/pycrypto
COPY build.sh *.py $SRC/
WORKDIR pycrypto
4 changes: 2 additions & 2 deletions projects/wheel/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
FROM gcr.io/oss-fuzz-base/base-builder-python
RUN git clone https://github.com/pypa/wheel wheel
FROM gcr.io/oss-fuzz-base/base-builder-python@sha256:254ba32c9e5a630865d0a4121fbe53ff7ba8c8394901005674ffa3de17efcd18
RUN git clone https://github.com/pypa/wheel
COPY *.sh *py $SRC/
WORKDIR $SRC/wheel