diff --git a/build/Dockerfile b/build/Dockerfile index 017d6604ce..895858f7a0 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,5 +1,5 @@ FROM centos:6 -LABEL version=0.1.1 +LABEL version=0.1.2 # Install dependencies for developer tools, bindings,\ # documentation, actorcompiler, and packaging tools\ @@ -8,11 +8,12 @@ RUN yum install -y yum-utils &&\ yum -y install centos-release-scl epel-release &&\ yum -y install devtoolset-7 mono-core java-1.8.0-openjdk-devel \ rh-python36-python-devel rh-ruby24 golang python27 \ - rpm-build debbuild python-pip npm ccache distcc + rpm-build debbuild python-pip npm ccache distcc &&\ + pip install boto3==1.1.1 -RUN adduser --comment '' fdb && chown -R fdb /opt && chmod -R 0777 /opt +USER root -USER fdb +RUN adduser --comment '' fdb && chown fdb /opt # wget of bintray without forcing UTF-8 encoding results in 403 Forbidden RUN cd /opt/ &&\ @@ -22,8 +23,6 @@ RUN cd /opt/ &&\ tar -xjf boost_1_67_0.tar.bz2 &&\ rm -rf boost_1_67_0.tar.bz2 boost-sha.txt boost_1_67_0/libs -USER root - # install cmake RUN curl -L https://github.com/Kitware/CMake/releases/download/v3.13.4/cmake-3.13.4-Linux-x86_64.tar.gz > /tmp/cmake.tar.gz &&\ echo "563a39e0a7c7368f81bfa1c3aff8b590a0617cdfe51177ddc808f66cc0866c76 /tmp/cmake.tar.gz" > /tmp/cmake-sha.txt &&\ diff --git a/build/docker-compose.yaml b/build/docker-compose.yaml index 5d860d5f4b..4a5b700565 100644 --- a/build/docker-compose.yaml +++ b/build/docker-compose.yaml @@ -2,7 +2,7 @@ version: "3" services: common: &common - image: foundationdb/foundationdb-build:0.1.1 + image: foundationdb/foundationdb-build:0.1.2 build-setup: &build-setup <<: *common