From 835ac52443e07e02255ee74ddf70ad30dd1428b4 Mon Sep 17 00:00:00 2001 From: Paulius Stakauskas Date: Thu, 8 Oct 2020 15:31:46 +0100 Subject: [PATCH 1/2] Update deb builds --- contrib/docker/dpkg-build/Dockerfile | 2 ++ contrib/docker/ubuntu-base/Dockerfile | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/contrib/docker/dpkg-build/Dockerfile b/contrib/docker/dpkg-build/Dockerfile index 237db75a8b..fcec53d64a 100644 --- a/contrib/docker/dpkg-build/Dockerfile +++ b/contrib/docker/dpkg-build/Dockerfile @@ -1,6 +1,8 @@ FROM commerceblock/debbase:latest ARG token +ENV CURLPP_LIBS -L/usr/local/lib64 -lcurl -lcurlpp \ + CURLPP_CFLAGS -Iinclude RUN set -ex \ && apt install -y jq \ diff --git a/contrib/docker/ubuntu-base/Dockerfile b/contrib/docker/ubuntu-base/Dockerfile index 4c8046fc39..4e7b9216aa 100644 --- a/contrib/docker/ubuntu-base/Dockerfile +++ b/contrib/docker/ubuntu-base/Dockerfile @@ -3,11 +3,12 @@ FROM ubuntu:18.04 RUN set -ex \ && apt-get -y update \ && apt-get -y install make automake cmake curl g++-multilib libtool \ - binutils-gold bsdmainutils pkg-config python3 patch git golang-go \ + binutils-gold bsdmainutils pkg-config python3 patch git golang-go \ + libcurlpp0 libcurlpp-dev \ && git clone https://github.com/buildkite/github-release.git \ && go get github.com/google/go-github/github \ && go get github.com/oleiade/reflections \ && go get golang.org/x/oauth2 \ && git clone https://github.com/commerceblock/ocean.git \ && cd ocean/depends \ - && make \ + && make From 3147a7fecc383a90e77291c4b543f3818b03afce Mon Sep 17 00:00:00 2001 From: Paulius Stakauskas Date: Thu, 8 Oct 2020 15:50:12 +0100 Subject: [PATCH 2/2] Update curlpp envs --- contrib/docker/dpkg-build/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/docker/dpkg-build/Dockerfile b/contrib/docker/dpkg-build/Dockerfile index fcec53d64a..4571fbdacc 100644 --- a/contrib/docker/dpkg-build/Dockerfile +++ b/contrib/docker/dpkg-build/Dockerfile @@ -1,8 +1,8 @@ FROM commerceblock/debbase:latest ARG token -ENV CURLPP_LIBS -L/usr/local/lib64 -lcurl -lcurlpp \ - CURLPP_CFLAGS -Iinclude +ENV CURLPP_LIBS -L/usr/local/lib64 -lcurl -lcurlpp +ENV CURLPP_CFLAGS -Iinclude RUN set -ex \ && apt install -y jq \