Skip to content

Commit

Permalink
Fix Fedora28 running procedure, README updated
Browse files Browse the repository at this point in the history
  • Loading branch information
ruzickap committed Aug 13, 2018
1 parent 26c8e58 commit 8eefbfc
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ cmdline() {
export WINDOWS_TYPE="server"
export WINDOWS_EDITION="standard"
export NAME="${MY_NAME}-${WINDOWS_TYPE}-${WINDOWS_VERSION}-${WINDOWS_RELEASE}-${WINDOWS_EDITION}-${WINDOWS_ARCH}-eval"
export ISO_URL="http://care.dlservice.microsoft.com/dl/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_SERVER_EVAL_EN-US-IR3_SSS_X64FREE_EN-US_DV9.ISO"
export ISO_URL="http://download.microsoft.com/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_SERVER_EVAL_EN-US-IR3_SSS_X64FREE_EN-US_DV9.ISO"
export ISO_CHECKSUM="6612b5b1f53e845aacdf96e974bb119a3d9b4dcb5b82e65804ab7e534dc7b4d5"
;;
*)
Expand All @@ -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 -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 -u $(id -u):$(id -g) --privileged -v $PWD:/home/docker/packer -v $TMPDIR:/home/docker/packer/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
4 changes: 2 additions & 2 deletions templates/my_windows-10-enterprise-eval.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ Here are the steps for latest Fedora how to install Vagrant from the official we
\`\`\`bash
dnf remove vagrant

dnf install -y https://releases.hashicorp.com/vagrant/2.0.3/vagrant_2.0.3_x86_64.rpm
dnf install -y https://releases.hashicorp.com/vagrant/2.1.2/vagrant_2.1.2_x86_64.rpm

# virtualbox
# Details here: https://rpmfusion.org/Howto/VirtualBox

# libvirt
dnf install -y gcc libvirt-daemon-kvm qemu-kvm libvirt-devel rdesktop
vagrant plugin install vagrant-libvirt
CONFIGURE_ARGS="with-libvirt-include=/usr/include/libvirt --with-libvirt-lib=/usr/lib64/libvirt" vagrant plugin install vagrant-libvirt
\`\`\`

## Getting started
Expand Down
4 changes: 2 additions & 2 deletions templates/windows-10-enterprise-eval.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ Here are the steps for latest Fedora how to install Vagrant from the official we
\`\`\`bash
dnf remove vagrant

dnf install -y https://releases.hashicorp.com/vagrant/2.0.3/vagrant_2.0.3_x86_64.rpm
dnf install -y https://releases.hashicorp.com/vagrant/2.1.2/vagrant_2.1.2_x86_64.rpm

# virtualbox
# Details here: https://rpmfusion.org/Howto/VirtualBox

# libvirt
dnf install -y gcc libvirt-daemon-kvm qemu-kvm libvirt-devel rdesktop
vagrant plugin install vagrant-libvirt
CONFIGURE_ARGS="with-libvirt-include=/usr/include/libvirt --with-libvirt-lib=/usr/lib64/libvirt" vagrant plugin install vagrant-libvirt
\`\`\`

## Getting started
Expand Down
4 changes: 2 additions & 2 deletions templates/windows-server-2012-eval.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ Here are the steps for latest Fedora how to install Vagrant from the official we
\`\`\`bash
dnf remove vagrant

dnf install -y https://releases.hashicorp.com/vagrant/2.0.3/vagrant_2.0.3_x86_64.rpm
dnf install -y https://releases.hashicorp.com/vagrant/2.1.2/vagrant_2.1.2_x86_64.rpm

# virtualbox
# Details here: https://rpmfusion.org/Howto/VirtualBox

# libvirt
dnf install -y gcc libvirt-daemon-kvm qemu-kvm libvirt-devel rdesktop
vagrant plugin install vagrant-libvirt
CONFIGURE_ARGS="with-libvirt-include=/usr/include/libvirt --with-libvirt-lib=/usr/lib64/libvirt" vagrant plugin install vagrant-libvirt
\`\`\`

## Getting started
Expand Down
4 changes: 2 additions & 2 deletions templates/windows-server-2016-eval.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ Here are the steps for latest Fedora how to install Vagrant from the official we
\`\`\`bash
dnf remove vagrant

dnf install -y https://releases.hashicorp.com/vagrant/2.0.3/vagrant_2.0.3_x86_64.rpm
dnf install -y https://releases.hashicorp.com/vagrant/2.1.2/vagrant_2.1.2_x86_64.rpm

# virtualbox
# Details here: https://rpmfusion.org/Howto/VirtualBox

# libvirt
dnf install -y gcc libvirt-daemon-kvm qemu-kvm libvirt-devel rdesktop
vagrant plugin install vagrant-libvirt
CONFIGURE_ARGS="with-libvirt-include=/usr/include/libvirt --with-libvirt-lib=/usr/lib64/libvirt" vagrant plugin install vagrant-libvirt
\`\`\`

## Getting started
Expand Down
2 changes: 1 addition & 1 deletion upload_box_to_vagrantup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ upload_boxfile_to_vagrantup() {
curl -sS https://app.vagrantup.com/api/v1/box/$VAGRANT_CLOUD_USER/$NAME/version/$VERSION/providers -X POST -d provider[name]="$VAGRANT_PROVIDER" -d access_token="$VAGRANTUP_ACCESS_TOKEN" > /dev/null
local UPLOAD_PATH=$(curl -sS https://app.vagrantup.com/api/v1/box/$VAGRANT_CLOUD_USER/$NAME/version/$VERSION/provider/$VAGRANT_PROVIDER/upload?access_token=$VAGRANTUP_ACCESS_TOKEN | jq -r '.upload_path')
echo "*** Uploading \"${NAME}-${VAGRANT_PROVIDER}.box\" to $UPLOAD_PATH as version [$VERSION]"
curl -s -X PUT --upload-file ${NAME}-${VAGRANT_PROVIDER}.box $UPLOAD_PATH
curl -X PUT --upload-file ${NAME}-${VAGRANT_PROVIDER}.box $UPLOAD_PATH
curl -s https://app.vagrantup.com/api/v1/box/$VAGRANT_CLOUD_USER/$NAME/version/$VERSION/release -X PUT -d access_token="$VAGRANTUP_ACCESS_TOKEN" > /dev/null
# Check if uploaded file really exists
if curl --output /dev/null --silent --head --fail "https://app.vagrantup.com/$VAGRANT_CLOUD_USER/boxes/$NAME/versions/$VERSION/providers/$VAGRANT_PROVIDER.box"; then
Expand Down

0 comments on commit 8eefbfc

Please sign in to comment.