diff --git a/packaging/Dockerfile b/packaging/Dockerfile index ed0ef1924..470898503 100644 --- a/packaging/Dockerfile +++ b/packaging/Dockerfile @@ -1,21 +1,6 @@ FROM ubuntu:16.04 - -ARG VCS_REF -ARG BUILD_DATE - ENV LANG C.UTF-8 -LABEL maintainer="Brannon King" \ - decription="build_lbrycrd" \ - version="1.0" \ - org.label-schema.name="build_lbrycrd" \ - org.label-schema.description="Use this to generate a reproducible build of LBRYcrd" \ - org.label-schema.build-date=$BUILD_DATE \ - org.label-schema.vcs-ref=$VCS_REF \ - org.label-schema.vcs-url="https://github.com/lbryio/lbrycrd" \ - org.label-schema.schema-version="1.0.0-rc1" \ - org.label-schema.docker.cmd="docker build --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` --build-arg VCS_REF=`git rev-parse --short HEAD` -t build_lbrycrd packaging" - RUN set -xe; \ apt-get update; \ apt-get install --no-install-recommends -y build-essential libtool autotools-dev automake pkg-config git wget apt-utils \ @@ -36,7 +21,22 @@ RUN update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang-cpp-8 update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix; \ update-alternatives --set i686-w64-mingw32-g++ /usr/bin/i686-w64-mingw32-g++-posix; \ /usr/sbin/update-ccache-symlinks; \ - cd /usr/include/c++ && ln -s /usr/lib/llvm-8/include/c++/v1; + cd /usr/include/c++ && ln -s /usr/lib/llvm-8/include/c++/v1; \ + cd /usr/lib/llvm-8/lib && ln -s libc++abi.so.1 libc++abi.so; + +ARG VCS_REF +ARG BUILD_DATE +LABEL maintainer="blockchain@lbry.com" \ + decription="build_lbrycrd" \ + version="1.1" \ + org.label-schema.name="build_lbrycrd" \ + org.label-schema.description="Use this to generate a reproducible build of LBRYcrd" \ + org.label-schema.build-date=$BUILD_DATE \ + org.label-schema.vcs-ref=$VCS_REF \ + org.label-schema.vcs-url="https://github.com/lbryio/lbrycrd" \ + org.label-schema.schema-version="1.0.0-rc1" \ + org.label-schema.vendor="LBRY" \ + org.label-schema.docker.cmd="docker build --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` --build-arg VCS_REF=`git rev-parse --short HEAD` -t lbry/build_lbrycrd packaging" ENV PATH "/usr/lib/ccache:$PATH" WORKDIR /home