Skip to content

Commit 42c785c

Browse files
committed
Use Ubuntu requirements installer in Ubuntu Docker image
1 parent 4b41ec5 commit 42c785c

File tree

2 files changed

+2
-20
lines changed

2 files changed

+2
-20
lines changed

Dockerfiles/install-ubuntu.sh

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,25 +13,7 @@ for key in "$@"; do
1313
done
1414

1515
# install requirements
16-
export DEBIAN_FRONTEND=noninteractive
17-
apt-get -y update
18-
apt-get -y install \
19-
cmake \
20-
g++-7 \
21-
git \
22-
python3-dev \
23-
python3-numpy \
24-
sudo \
25-
wget
26-
27-
# install bazel
28-
export BAZEL_VERSION=${BAZEL_VERSION:-`cat ./tensorflow_cc/Dockerfiles/BAZEL_VERSION`}
29-
apt-get -y install pkg-config zip g++ zlib1g-dev unzip python
30-
bazel_installer=bazel-${BAZEL_VERSION}-installer-linux-x86_64.sh
31-
wget -P /tmp https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/${bazel_installer}
32-
chmod +x /tmp/${bazel_installer}
33-
/tmp/${bazel_installer}
34-
rm /tmp/${bazel_installer}
16+
./tensorflow_cc/ubuntu-requirements.sh
3517

3618
if $cuda; then
3719
# install libcupti

ubuntu-requirements.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ if [[ "$OSTYPE" == "linux-gnu" ]]; then
2121
wget
2222

2323
# install bazel
24-
export BAZEL_VERSION=${BAZEL_VERSION:-`cat ./Dockerfiles/BAZEL_VERSION`}
24+
export BAZEL_VERSION=${BAZEL_VERSION:-`cat $(dirname "$0")/Dockerfiles/BAZEL_VERSION`}
2525
apt-get -y install pkg-config zip g++ zlib1g-dev unzip python
2626
bazel_installer=bazel-${BAZEL_VERSION}-installer-linux-x86_64.sh
2727
wget -P /tmp https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/${bazel_installer}

0 commit comments

Comments
 (0)