Skip to content

Commit

Permalink
Documentation improved, added date to build script
Browse files Browse the repository at this point in the history
  • Loading branch information
ruzickap committed May 21, 2018
1 parent 20798b7 commit 97a2775
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 9 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ sudo reboot
sudo sed -i 's@^SELINUX=enforcing@SELINUX=disabled@' /etc/selinux/config
sudo dnf upgrade -y
sudo dnf install -y http://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm http://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm
sudo dnf install -y curl git docker VirtualBox
sudo dnf install -y curl git docker kmod-VirtualBox
sudo groupadd docker && sudo gpasswd -a ${USER} docker
sudo systemctl enable docker
Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ cmdline() {
packer_build() {
if [ ! -f "${NAME}-${PACKER_VAGRANT_PROVIDER}.box" ]; then
if [ $USE_DOCKERIZED_PACKER = "true" ]; then
docker run --rm -it -p $WINRM_SSH_PORT:2299 -p $VNC_PORT:5999 $DOCKER_ENV_PARAMETERS --privileged --cap-add=ALL -v /lib/modules:/lib/modules:ro -v $PWD:/var/tmp/packer-templates/ -v $TMPDIR:/var/tmp/packer-templates/packer_cache/ peru/packer_qemu_virtualbox_ansible \
docker run --rm -it -p $WINRM_SSH_PORT:2299 -p $VNC_PORT:5999 $DOCKER_ENV_PARAMETERS --privileged -v $PWD:/var/tmp/packer-templates/ -v $TMPDIR:/var/tmp/packer-templates/packer_cache/ peru/packer_qemu_virtualbox_ansible \
build -only="$PACKER_BUILDER_TYPE" -color=false -var "headless=$HEADLESS" $PACKER_FILE 2>&1 | tee "${LOG_DIR}/${NAME}-${PACKER_BUILDER_TYPE}-packer.log"
else
$PACKER_BINARY build -only="$PACKER_BUILDER_TYPE" -color=false -var "headless=$HEADLESS" $PACKER_FILE 2>&1 | tee "${LOG_DIR}/${NAME}-${PACKER_BUILDER_TYPE}-packer.log"
Expand Down
9 changes: 2 additions & 7 deletions build_all.sh
Original file line number Diff line number Diff line change
@@ -1,22 +1,17 @@
#!/bin/bash -eu

export VERSION="$(date +%Y%m%d).01"
LOGFILE="/tmp/build_all.log"
#export USE_DOCKERIZED_PACKER="true"

(

date

for PACKER_VAGRANT_PROVIDER in libvirt virtualbox; do
for BUILD in ubuntu-18.04-desktop ubuntu-{18.04,16.04,14.04}-server my_ubuntu-{18.04,16.04}-server my_centos-7 my_windows-10 windows-10 windows-2016 windows-2012_r2; do
echo "**** `date`"
./build.sh $BUILD:$PACKER_VAGRANT_PROVIDER
done
done

date

./vagrant_init_destroy_boxes.sh

date

) 2>&1 | tee $LOGFILE

0 comments on commit 97a2775

Please sign in to comment.