diff --git a/docker/build.sh b/build_docker.sh similarity index 56% rename from docker/build.sh rename to build_docker.sh index 38c57a05e..916f9b95f 100755 --- a/docker/build.sh +++ b/build_docker.sh @@ -1,4 +1,4 @@ #!/bin/bash echo 'Building Dockerfile with image name pymarl:1.0' -docker build -t pymarl:1.0 . +docker build -t pymarl:1.0 -f ./docker/Dockerfile . diff --git a/docker/Dockerfile b/docker/Dockerfile index 3e790f1a0..c78c03a1e 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -24,30 +24,30 @@ RUN apt-get update RUN apt-get -y install python3 RUN apt-get -y install python3-pip RUN pip3 install --upgrade pip - -# Python packages we use (or used at one point...) RUN curl -fsSL https://bootstrap.pypa.io/pip/3.5/get-pip.py | python3.5 -RUN pip3 install numpy scipy pyyaml matplotlib -RUN pip3 install imageio -RUN pip3 install tensorboard-logger -RUN pip3 install pygame RUN mkdir /install WORKDIR /install -RUN pip3 install jsonpickle==0.9.6 -# install Sacred (from OxWhirl fork) -RUN pip3 install setuptools -RUN git clone https://github.com/oxwhirl/sacred.git /install/sacred && cd /install/sacred && python3 setup.py install - #### ------------------------------------------------------------------- #### install pytorch #### ------------------------------------------------------------------- -RUN pip3 install torch -RUN pip3 install torchvision snakeviz pytest probscale +RUN pip3 install torch===0.4.1 torchvision -f https://download.pytorch.org/whl/torch_stable.html + +COPY requirements.txt /pymarl/requirements.txt +RUN pip install -r /pymarl/requirements.txt + +RUN pip3 install jsonpickle==0.9.6 +# install Sacred (from OxWhirl fork) +RUN pip3 install setuptools===20.7.0 +RUN git clone https://github.com/oxwhirl/sacred.git /install/sacred && cd /install/sacred && python3 setup.py install ## -- SMAC RUN pip3 install git+https://github.com/oxwhirl/smac.git ENV SC2PATH /pymarl/3rdparty/StarCraftII +COPY . /pymarl + WORKDIR /pymarl + +RUN bash install_sc2.sh \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 8419b5588..ce6cade73 100644 --- a/requirements.txt +++ b/requirements.txt @@ -23,9 +23,9 @@ Pillow==6.2.0 pluggy==0.7.1 portpicker==1.2.0 probscale==0.2.3 -protobuf==3.6.1 +protobuf==3.19.5 py==1.6.0 -pygame==1.9.4 +pygame==2.0.0 pyparsing==2.2.2 pysc2==3.0.0 pytest==3.8.2