Set golang version when creating image

This commit is contained in:
Bob Mottram 2018-04-07 22:17:56 +01:00
parent 30af6b69a7
commit 100b2a5ead
1 changed files with 2 additions and 1 deletions

View File

@ -1825,6 +1825,7 @@ image_setup_utils() {
echo "export PATH=\$PATH:\$GOPATH" >> "${rootdir}/home/go/.bashrc" echo "export PATH=\$PATH:\$GOPATH" >> "${rootdir}/home/go/.bashrc"
chroot "$rootdir" chown -R go:go /home/go chroot "$rootdir" chown -R go:go /home/go
cp "${rootdir}/home/go/go${GO_VERSION}/bin/"* "${rootdir}/usr/bin" cp "${rootdir}/home/go/go${GO_VERSION}/bin/"* "${rootdir}/usr/bin"
echo "upgrade_golang:$GO_VERSION" >> "${rootdir}/root/${PROJECT_NAME}-completed.txt"
# Tomb # Tomb
chroot "$rootdir" apt-get -yq install zsh pinentry-curses chroot "$rootdir" apt-get -yq install zsh pinentry-curses
@ -1832,7 +1833,7 @@ image_setup_utils() {
cd "$rootdir/root/build/tomb" || exit 468368345425 cd "$rootdir/root/build/tomb" || exit 468368345425
git checkout "$TOMB_COMMIT" -b "$TOMB_COMMIT" git checkout "$TOMB_COMMIT" -b "$TOMB_COMMIT"
chroot "$rootdir" cd /root/build/tomb && make install chroot "$rootdir" cd /root/build/tomb && make install
echo "tomb commit:$TOMB_COMMIT" >> "$rootdir/root/freedombone-completed.txt" echo "tomb commit:$TOMB_COMMIT" >> "$rootdir/root/${PROJECT_NAME}-completed.txt"
if ! grep -q '\* hard maxsyslogins' "$rootdir/etc/security/limits.conf"; then if ! grep -q '\* hard maxsyslogins' "$rootdir/etc/security/limits.conf"; then
echo '* hard maxsyslogins 10' >> "$rootdir/etc/security/limits.conf" echo '* hard maxsyslogins 10' >> "$rootdir/etc/security/limits.conf"