Skip to content

Commit

Permalink
Tune memory usage
Browse files Browse the repository at this point in the history
  • Loading branch information
benhylau committed Feb 1, 2018
1 parent e775151 commit 445ce56
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ Vagrant.configure("2") do |config|
config.vm.provision :shell, path: "bootstrap.sh"

config.vm.provider "virtualbox" do |v|
v.memory = 6144
v.memory = 2048
end
end
3 changes: 1 addition & 2 deletions bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ apt install -y \
gnupg2 \
qemu-user-static \
software-properties-common \
swapspace \
vim

# Install docker-ce
Expand Down Expand Up @@ -49,4 +48,4 @@ if [ -f /vagrant/.github_publish ]; then
echo "export GITHUB_TOKEN=$GITHUB_TOKEN"
echo "export GITHUB_RELEASE_VERSION=$GITHUB_RELEASE_VERSION"
} >> /etc/profile
fi
fi
2 changes: 1 addition & 1 deletion src/debian-packages/cjdns/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ build_bin_armhf: mkdir_build
mkdir -p $(BUILD_DIR)/docker/build
cd $(BUILD_DIR)/docker; \
sudo docker build -t cjdns-armv7hf . # Build armv7hf docker container
sudo docker run --memory="5g" -v /usr/bin/qemu-arm-static:/usr/bin/qemu-arm-static -v $(BUILD_DIR)/docker/build:/tmp/cjdns cjdns-armv7hf # Build binary in emulated ARM docker
sudo docker run --memory="1g" -v /usr/bin/qemu-arm-static:/usr/bin/qemu-arm-static -v $(BUILD_DIR)/docker/build:/tmp/cjdns cjdns-armv7hf # Build binary in emulated ARM docker (make sure we leave enough memory for the vagrant box otherwise the compilation hangs)
cd $(BUILD_DIR)/docker/build; \
cp cjdroute $(BUILD_DIR)/bin/armhf/

Expand Down

0 comments on commit 445ce56

Please sign in to comment.