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

fix ppa repositories in ci_build #1904

Merged
merged 1 commit into from Apr 13, 2016
Merged

fix ppa repositories in ci_build #1904

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
4 changes: 3 additions & 1 deletion tensorflow/tools/ci_build/Dockerfile.android
View file
Open in desktop
Expand Up @@ -5,7 +5,9 @@ MAINTAINER Jan Prach <jendap@google.com>
# Copy and run the install scripts.
COPY install/*.sh /install/
RUN /install/install_bootstrap_deb_packages.sh
RUN add-apt-repository -y ppa:openjdk-r/ppa
RUN add-apt-repository -y ppa:openjdk-r/ppa && \
add-apt-repository -y ppa:mc3man/trusty-media && \
add-apt-repository -y ppa:george-edison55/cmake-3.x
RUN /install/install_deb_packages.sh
RUN /install/install_bazel.sh

Expand Down
4 changes: 3 additions & 1 deletion tensorflow/tools/ci_build/Dockerfile.cpu
View file
Open in desktop
Expand Up @@ -5,7 +5,9 @@ MAINTAINER Jan Prach <jendap@google.com>
# Copy and run the install scripts.
COPY install/*.sh /install/
RUN /install/install_bootstrap_deb_packages.sh
RUN add-apt-repository -y ppa:openjdk-r/ppa
RUN add-apt-repository -y ppa:openjdk-r/ppa && \
add-apt-repository -y ppa:mc3man/trusty-media && \
add-apt-repository -y ppa:george-edison55/cmake-3.x
RUN /install/install_deb_packages.sh
RUN /install/install_pip_packages.sh
RUN /install/install_bazel.sh
Expand Down
4 changes: 3 additions & 1 deletion tensorflow/tools/ci_build/Dockerfile.gpu
View file
Open in desktop
Expand Up @@ -5,7 +5,9 @@ MAINTAINER Jan Prach <jendap@google.com>
# Copy and run the install scripts.
COPY install/*.sh /install/
RUN /install/install_bootstrap_deb_packages.sh
RUN add-apt-repository -y ppa:openjdk-r/ppa
RUN add-apt-repository -y ppa:openjdk-r/ppa && \
add-apt-repository -y ppa:mc3man/trusty-media && \
add-apt-repository -y ppa:george-edison55/cmake-3.x
RUN /install/install_deb_packages.sh
RUN /install/install_pip_packages.sh
RUN /install/install_bazel.sh
Expand Down
4 changes: 3 additions & 1 deletion tensorflow/tools/ci_build/Dockerfile.tensorboard
View file
Open in desktop
Expand Up @@ -5,6 +5,8 @@ MAINTAINER Jan Prach <jendap@google.com>
# Copy and run the install scripts.
COPY install/*.sh /install/
RUN /install/install_bootstrap_deb_packages.sh
RUN add-apt-repository -y ppa:openjdk-r/ppa
RUN add-apt-repository -y ppa:openjdk-r/ppa && \
add-apt-repository -y ppa:mc3man/trusty-media && \
add-apt-repository -y ppa:george-edison55/cmake-3.x
RUN /install/install_deb_packages.sh
RUN /install/install_tensorboard_packages.sh
7 changes: 0 additions & 7 deletions tensorflow/tools/ci_build/install/install_deb_packages.sh
View file
Open in desktop
Expand Up @@ -16,13 +16,6 @@

set -e

# Install FFmpeg from an alternate repository.
apt-get install -y software-properties-common
add-apt-repository -y ppa:mc3man/trusty-media
# Install CMake 3.x
add-apt-repository -y ppa:george-edison55/cmake-3.x
apt-get update

# Install dependencies from ubuntu deb repository.
apt-get update
apt-get install -y \
Expand Down