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

chore: Remove unnecessary usage of deadsnakes ppa #13045

Merged
merged 1 commit into from
Jun 22, 2022
Merged

chore: Remove unnecessary usage of deadsnakes ppa #13045

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 1 addition & 5 deletions cwf/gateway/docker/python/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ RUN curl -Lfs https://github.com/protocolbuffers/protobuf/releases/download/v3.1
chmod -R a+Xr /usr/include/google && \
rm -rf protoc3.zip protoc3

# Install python3.8 since it's not native on focal
RUN apt-add-repository "ppa:deadsnakes/ppa"
RUN apt-get -y update && apt-get -y install python3.8

ENV MAGMA_ROOT /magma
Expand Down Expand Up @@ -54,9 +52,6 @@ RUN apt-key add /tmp/jfrog.pub && \
apt-add-repository "deb https://artifactory.magmacore.org/artifactory/debian-test focal-ci main" && \
apt-add-repository "deb http://archive.ubuntu.com/ubuntu/ focal-proposed restricted main multiverse universe"

# Install python3.8 since it's not native on focal
RUN apt-add-repository "ppa:deadsnakes/ppa"
RUN apt-get -y update && apt-get -y install python3.8
RUN apt-get -y update && apt-get -y install \
curl \
libc-ares2 \
Expand All @@ -72,6 +67,7 @@ RUN apt-get -y update && apt-get -y install \
pkg-config \
python-cffi \
python3-pip \
python3.8 \
python3.8-dev \
redis-server \
iptables \
Expand Down
7 changes: 1 addition & 6 deletions feg/gateway/docker/python/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ RUN curl -Lfs https://github.com/protocolbuffers/protobuf/releases/download/v3.1
chmod -R a+Xr /usr/include/google && \
rm -rf protoc3.zip protoc3

# Install python3.8 since it's not native on focal
RUN apt-add-repository "ppa:deadsnakes/ppa"
RUN apt-get -y update && apt-get -y install python3.8

ENV MAGMA_ROOT /magma
Expand Down Expand Up @@ -75,10 +73,6 @@ RUN curl -L http://packages.fluentbit.io/fluentbit.key > /tmp/fluentbit.key
RUN apt-key add /tmp/fluentbit.key && \
apt-add-repository "deb https://packages.fluentbit.io/ubuntu/focal focal main"

# Install python3.8 since it's not native on focal
RUN apt-add-repository "ppa:deadsnakes/ppa"
RUN apt-get -y update && apt-get -y install python3.8

# Install the runtime deps from apt.
RUN apt-get -y update && apt-get -y install \
iproute2 \
Expand All @@ -96,6 +90,7 @@ RUN apt-get -y update && apt-get -y install \
pkg-config \
python-cffi \
python3-pip \
python3.8 \
python3.8-dev \
redis-server \
git \
Expand Down
7 changes: 1 addition & 6 deletions orc8r/gateway/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ RUN curl -Lfs https://github.com/protocolbuffers/protobuf/releases/download/v3.1
chmod -R a+Xr /usr/include/google && \
rm -rf protoc3.zip protoc3

# Install python3.8 since it's not native on focal
RUN apt-add-repository "ppa:deadsnakes/ppa"
RUN apt-get -y update && apt-get -y install python3.8

ENV MAGMA_ROOT /magma
Expand Down Expand Up @@ -45,10 +43,6 @@ COPY cwf/gateway/deploy/roles/ovs/files/magma-preferences /etc/apt/preferences.d
RUN apt-key add /tmp/jfrog.pub && \
apt-add-repository "deb https://artifactory.magmacore.org/artifactory/debian-test focal-ci main"

# Install python3.8 since it's not native on focal
RUN apt-add-repository "ppa:deadsnakes/ppa"
RUN apt-get -y update && apt-get -y install python3.8

# Install the runtime deps from apt.
RUN apt-get -y update && apt-get -y install \
curl \
Expand All @@ -67,6 +61,7 @@ RUN apt-get -y update && apt-get -y install \
pkg-config \
python-cffi \
python3-pip \
python3.8 \
python3.8-dev \
redis-server \
network-manager
Expand Down