Bitmessage/buildbot-scripts
3
0
Fork 2
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Compare commits

base: Bitmessage:87b91e32039d651734aac3c8540872ebe97ef52e
Branches Tags
Bitmessage:master
..
compare: Bitmessage:e2e6c24d13a755fb5639aef9c25cd7e5a47f8645
Branches Tags
Bitmessage:master

No commits in common. "87b91e32039d651734aac3c8540872ebe97ef52e" and "e2e6c24d13a755fb5639aef9c25cd7e5a47f8645" have entirely different histories.
87b91e3203 ... e2e6c24d13

2 changed files with 11 additions and 13 deletions
Show Stats Expand all files Collapse all files

21
docker-install-all.sh
View File

@ -27,17 +27,16 @@ mem=$(sed -E 's/^MemTotal: +([0-9]+) kB/\1/p;d' < /proc/meminfo)
mempercore=$(((mem/1024-4096)/cores)) mempercore=$(((mem/1024-4096)/cores))
# install kata containers # install kata containers
if ! docker info 2>/dev/null|grep Runtimes:|grep -qs kata-qemu-virtiofs; then echo "Installing kata...."
echo "Installing kata...." cid=$(docker run -d --runtime=runc -v /opt/kata:/opt/kata -v /var/run/dbus:/var/run/dbus -v /run/systemd:/run/systemd -v /etc/docker:/etc/docker -it katadocker/kata-deploy kata-deploy-docker install)
cid=$(docker run -d --runtime=runc -v /opt/kata:/opt/kata -v /var/run/dbus:/var/run/dbus -v /run/systemd:/run/systemd -v /etc/docker:/etc/docker -it katadocker/kata-deploy kata-deploy-docker install) # wait for finish
# wait for finish while [ "$(docker container inspect -f '{{.State.Running}}' "$cid")" == "true" ]; do
while [ "$(docker container inspect -f '{{.State.Running}}' "$cid")" == "true" ]; do sleep 1
sleep 1 done
done echo "Kata installed"
# update default container CPU and memory
sed -i "s/default_vcpus = .*/default_vcpus = 2/g;s/default_memory = .*/default-memory = $mempercore/g" /opt/kata/share/defaults/kata-containers/configuration-qemu-virtiofs.toml # update default container CPU and memory
echo "Kata installed" sed -i "s/default_vcpus = .*/default_vcpus = 2/g;s/default_memory = .*/default-memory = $mempercore/g" /opt/kata/share/defaults/kata-containers/configuration-qemu-virtiofs.toml
fi
trusty trusty
xenial xenial

3
docker/bionic/Dockerfile
View File

@ -29,8 +29,7 @@ RUN apt-get install -yq --no-install-suggests --no-install-recommends \
RUN apt-get install -yq --no-install-suggests --no-install-recommends \ RUN apt-get install -yq --no-install-suggests --no-install-recommends \
python-minimal python-setuptools python-all python openssl libssl-dev \ python-minimal python-setuptools python-all python openssl libssl-dev \
dh-apparmor debhelper dh-python python-msgpack python-qt4 python-stdeb \ dh-apparmor debhelper dh-python python-msgpack python-qt4 python-stdeb \
python-all-dev python-crypto python-pycryptopp python-psutil \ python-all-dev python-crypto python-pycryptopp python-psutil python-pytest
fakeroot python-pytest
# Code quality # Code quality
RUN apt-get install -yq --no-install-suggests --no-install-recommends \ RUN apt-get install -yq --no-install-suggests --no-install-recommends \