Skip to content

Commit

Permalink
Merge pull request #15 from sony/feature/20220324-remove-conda
Browse files Browse the repository at this point in the history
remove conda from dockerfile.build
  • Loading branch information
YukioOobuchi authored Mar 28, 2022
2 parents 284c41a + 39bfef9 commit 31f592b
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 23 deletions.
2 changes: 1 addition & 1 deletion GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ nnabla-nas-wheel:

.PHONY:bwd-nnabla-nas-wheel
bwd-nnabla-nas-wheel:nnabla-nas-build-env
docker run -v $$(pwd):$$(pwd) -w $$(pwd) $(NNABLA_NAS_BUILD_ENV_DOCKER_IMAGE_NAME) make nnabla-nas-wheel
docker run -v $$(pwd):$$(pwd) -w $$(pwd) -u $$(id -u):$$(id -g) $(NNABLA_NAS_BUILD_ENV_DOCKER_IMAGE_NAME) make nnabla-nas-wheel

40 changes: 18 additions & 22 deletions docker/development/Dockerfile.build
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Copyright (c) 2020 Sony Corporation. All Rights Reserved.
# Copyright 2020 Sony Corporation. All Rights Reserved.
# Copyright 2022 Sony Group Corporation. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -12,29 +13,24 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM ubuntu:16.04
FROM centos:7

RUN apt-get update \
&& apt-get install -y --no-install-recommends \
bzip2 \
ca-certificates \
curl \
python3-pip \
make \
&& rm -rf /var/lib/apt/lists/*
RUN yum install -y epel-release yum-utils \
&& yum install -y bzip2 curl libffi-devel make openssl-devel zlib-devel \
&& yum group install -y "Development Tools" \
&& yum clean all

RUN umask 0 \
&& mkdir -p /tmp/deps \
RUN mkdir -p /tmp/deps \
&& cd /tmp/deps \
&& curl -L https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -o Miniconda3-latest-Linux-x86_64.sh \
&& bash Miniconda3-latest-Linux-x86_64.sh -b -p /opt/miniconda3 \
&& rm -rf Miniconda3-latest-Linux-x86_64.sh \
&& PATH=/opt/miniconda3/bin:$PATH \
&& conda install python=3.6.5 \
&& conda install pip wheel setuptools \
&& conda clean -y --all \
&& cd / \
&& rm -rf /tmp/*
&& curl -O https://www.python.org/ftp/python/3.7.10/Python-3.7.10.tgz \
&& tar xzf Python-3.7.10.tgz \
&& cd Python-3.7.10 \
&& ./configure --enable-optimizations \
&& make altinstall \
&& ln -sf /usr/local/bin/python3.7 /usr/local/bin/python3 \
&& ln -sf /usr/local/bin/pip3.7 /usr/local/bin/pip3 \
&& rm -rf /tmp/deps

ENV PATH /opt/miniconda3/bin:$PATH
RUN pip3 install -U pip \
&& pip install setuptools wheel

0 comments on commit 31f592b

Please sign in to comment.