Minecon724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Docker base update (#2898)

Browse source 
* update base docker images to ubuntu 18.04
reference updated artifacts

* OSX was not upgraded no need to rename
This commit is contained in:
Russel Waters 2020-08-28 09:07:39 -07:00 • committed by GitHub
commit 286c70b5b5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/release_test.yml vendored
View file

@ -32,7 +32,7 @@ jobs:
- name: Fetch Deps
run: ci/actions/linux/install_deps.sh
- name: Run Tests
run: docker run -v ${PWD}:/workspace nanocurrency/nano-env:gcc /bin/bash -c "cd /workspace && RELEASE=1 ./ci/build-travis.sh /usr/lib/x86_64-linux-gnu/cmake/Qt5 ${PWD}"
run: docker run -v ${PWD}:/workspace nanocurrency/nano-env:gcc /bin/bash -c "cd /workspace && export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/tmp/boost/lib && ldconfig && RELEASE=1 ./ci/build-travis.sh /usr/lib/x86_64-linux-gnu/cmake/Qt5 ${PWD}"
clang_test:
runs-on: ubuntu-18.04
@ -44,7 +44,7 @@ jobs:
- name: Fetch Deps
run: ci/actions/linux/install_deps.sh
- name: Run Tests
run: docker run -v ${PWD}:/workspace nanocurrency/nano-env:clang-6 /bin/bash -c "cd /workspace && RELEASE=1 ./ci/build-travis.sh /usr/lib/x86_64-linux-gnu/cmake/Qt5 ${PWD}"
run: docker run -v ${PWD}:/workspace nanocurrency/nano-env:clang-6 /bin/bash -c "cd /workspace && export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/tmp/boost/lib && ldconfig && RELEASE=1 ./ci/build-travis.sh /usr/lib/x86_64-linux-gnu/cmake/Qt5 ${PWD}"
windows_test:
runs-on: windows-latest

4
.github/workflows/tests.yml vendored
View file

@ -30,7 +30,7 @@ jobs:
- name: Fetch Deps
run: ci/actions/linux/install_deps.sh
- name: Run Tests
run: docker run -v ${PWD}:/workspace nanocurrency/nano-env:gcc /bin/bash -c "cd /workspace && ./ci/build-travis.sh /usr/lib/x86_64-linux-gnu/cmake/Qt5 ${PWD}"
run: docker run -v ${PWD}:/workspace nanocurrency/nano-env:gcc /bin/bash -c "cd /workspace && export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/tmp/boost/lib && ldconfig && ./ci/build-travis.sh /usr/lib/x86_64-linux-gnu/cmake/Qt5 ${PWD}"
clang_test:
runs-on: ubuntu-18.04
@ -42,7 +42,7 @@ jobs:
- name: Fetch Deps
run: ci/actions/linux/install_deps.sh
- name: Run Tests
run: docker run -v ${PWD}:/workspace nanocurrency/nano-env:clang-6 /bin/bash -c "cd /workspace && ./ci/build-travis.sh /usr/lib/x86_64-linux-gnu/cmake/Qt5 ${PWD}"
run: docker run -v ${PWD}:/workspace nanocurrency/nano-env:clang-6 /bin/bash -c "cd /workspace && export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/tmp/boost/lib && ldconfig && ./ci/build-travis.sh /usr/lib/x86_64-linux-gnu/cmake/Qt5 ${PWD}"
windows_test:
runs-on: windows-latest

5
docker/ci/Dockerfile-base
View file

@ -1,4 +1,4 @@
FROM ubuntu:16.04
FROM ubuntu:18.04
ENV DEBIAN_FRONTEND=noninteractive
@ -6,7 +6,8 @@ RUN apt-get update -qq && apt-get install -yqq \
build-essential \
g++ \
wget \
python
python \
zlib1g-dev
RUN wget -O cmake_install.sh https://github.com/Kitware/CMake/releases/download/v3.15.4/cmake-3.15.4-Linux-x86_64.sh && \
chmod +x cmake_install.sh && \

2
docker/node/Dockerfile
View file

@ -16,7 +16,7 @@ RUN mkdir /tmp/build && \
cd .. && \
echo ${NETWORK} > /etc/nano-network
FROM ubuntu:16.04
FROM ubuntu:18.04
RUN groupadd --gid 1000 nanocurrency && \
useradd --uid 1000 --gid nanocurrency --shell /bin/bash --create-home nanocurrency

6
util/build_prep/fetch_boost.sh
View file

@ -4,7 +4,11 @@ OS=`uname`
COMPILER="${COMPILER:-clang}"
pushd /tmp
wget -O boost-$OS-$COMPILER.tgz https://s3.us-east-2.amazonaws.com/repo.nano.org/artifacts/boost-$OS-$COMPILER-1.70-full.tgz
if [[ "$OS" == 'Linux' ]]; then
wget -O boost-$OS-$COMPILER.tgz https://s3.us-east-2.amazonaws.com/repo.nano.org/artifacts/boost-$OS-$COMPILER-1.70-full-18.tgz
else
wget -O boost-$OS-$COMPILER.tgz https://s3.us-east-2.amazonaws.com/repo.nano.org/artifacts/boost-$OS-$COMPILER-1.70-full.tgz
fi
tar -zxf boost-$OS-$COMPILER.tgz
mv tmp/* .
rm -fr tmp

7
util/build_prep/fetch_rocksdb.sh
View file

@ -1,11 +1,6 @@
#!/usr/bin/env bash
OS=`uname`
if [[ $OS =~ "Darwin" ]]; then
artifact="rocksdb-clang-latest.tgz"
else
artifact="rocksdb-gcc-latest.tgz"
fi
artifact="rocksdb-Linux-6.3.6-18.tgz"
pushd /tmp
wget -O $artifact https://s3.us-east-2.amazonaws.com/repo.nano.org/artifacts/$artifact