From f7cb063822c76435717bfe4a23162988e115c71d Mon Sep 17 00:00:00 2001 From: Sergio Leunissen Date: Thu, 11 Jun 2020 12:20:37 +0200 Subject: [PATCH 1/7] Update Readme.MD with new repo name --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 5dae825a..ed0f3ea8 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -# vagrant-boxes -A vagrant box that provisions Oracle software automatically, using Vagrant, an Oracle Linux box and a shell script. +# vagrant-projects +A collection of Vagrant projects that provision Oracle and other software automatically, using Vagrant, an Oracle Linux box, and shell scripts. ## Prerequisites 1. Install [Oracle VM VirtualBox](https://www.virtualbox.org/wiki/Downloads) 2. Install [Vagrant](https://vagrantup.com/) ## Getting started -1. Clone this repository `git clone https://github.com/oracle/vagrant-boxes` +1. Clone this repository `git clone https://github.com/oracle/vagrant-projects` 2. Change into the desired software folder 3. Follow the README.md instructions inside the folder From 0737e6e6cdfa750390b0c7f8ab4dab31f91258e8 Mon Sep 17 00:00:00 2001 From: Sergio Leunissen Date: Thu, 11 Jun 2020 12:28:37 +0200 Subject: [PATCH 2/7] Update Readme.MD with new repo name New repo name: vagrant-projects. Update README to use consistent terminology. --- ContainerRegistry/README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ContainerRegistry/README.md b/ContainerRegistry/README.md index 1ecfbf57..19c23ec5 100644 --- a/ContainerRegistry/README.md +++ b/ContainerRegistry/README.md @@ -1,5 +1,5 @@ -# Vagrantfile to run a local Container Registry on Oracle Linux 7 -This simple Vagrantfile will provision an Oracle Linux 7 box running a local +# Vagrant project to run a local Container Registry on Oracle Linux 7 +This simple Vagrantfile will provision an Oracle Linux 7 VM running a local Container Registry. It can be used as cache for the Oracle Container Registry, in particular for @@ -13,14 +13,14 @@ and accept the _Oracle Standard Terms and Restrictions_ for the _Container Services_ Business Area. ## Quick start -1. Clone this repository `git clone https://github.com/oracle/vagrant-boxes` +1. Clone this repository `git clone https://github.com/oracle/vagrant-projects` 1. Change into the `vagrant-boxes/ContainerRegistry` folder 1. Run `vagrant up; vagrant ssh` Your local container registry is up and running! ## Configuration -The Vagrantfile can be used _as-is_; there are a couple of parameters you +The Vagrant project can be used _as-is_; there are a couple of parameters you can set to tailor the installation to your needs. ### How to configure @@ -82,7 +82,7 @@ cluster will be fully operational after a `vagrant up`! ## Optional plugins -When installed, this Vagrantfile will make use of the following third party Vagrant plugins: +When installed, this Vagrant project will make use of the following third party Vagrant plugins: - [vagrant-env](https://github.com/gosuri/vagrant-env): loads environment variables from .env files; - [vagrant-proxyconf](https://github.com/tmatilai/vagrant-proxyconf): set From b6439a65287958a23f578242eb58ff18a5b81190 Mon Sep 17 00:00:00 2001 From: Sergio Leunissen Date: Thu, 11 Jun 2020 12:50:06 +0200 Subject: [PATCH 3/7] Add instructions for libvirt/kvm --- README.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ed0f3ea8..f778b97b 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,16 @@ # vagrant-projects -A collection of Vagrant projects that provision Oracle and other software automatically, using Vagrant, an Oracle Linux box, and shell scripts. +A collection of Vagrant projects that provision Oracle and other software automatically, using Vagrant, an Oracle Linux box, and shell scripts. Unless indicated otherwise, these projects work with both Oracle VM VirtualBox and libvirt/KVM. -## Prerequisites +## Prerequisites +All projects in this repository require Vagrant and either Oracle VM VirtualBox or libvirt/KVM with the vagrant-libvirt plugin. + +### If using VirtualBox 1. Install [Oracle VM VirtualBox](https://www.virtualbox.org/wiki/Downloads) 2. Install [Vagrant](https://vagrantup.com/) +### If using libvirt/KVM on Oracle Linux +1. Read [Philippe's blog post](https://blogs.oracle.com/linux/getting-started-with-the-vagrant-libvirt-provider-for-oracle-linux) for instructions on using the Vagrant libvirt provider + ## Getting started 1. Clone this repository `git clone https://github.com/oracle/vagrant-projects` 2. Change into the desired software folder From b222fdcf9c2354f78ad1ce6e4a12006fa2d5b4fc Mon Sep 17 00:00:00 2001 From: Sergio Leunissen Date: Thu, 11 Jun 2020 12:53:03 +0200 Subject: [PATCH 4/7] Change prereqs to point to top level README --- ContainerRegistry/README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ContainerRegistry/README.md b/ContainerRegistry/README.md index 19c23ec5..97268bc6 100644 --- a/ContainerRegistry/README.md +++ b/ContainerRegistry/README.md @@ -6,8 +6,7 @@ It can be used as cache for the Oracle Container Registry, in particular for the Kubernetes containers. ## Prerequisites -1. Install [Oracle VM VirtualBox](https://www.virtualbox.org/wiki/Downloads) -1. Install [Vagrant](https://vagrantup.com/) +1. Read the [prerequisites in the top level README](/vgrant-projects#prerequisites) to set up either Vagrant with either VirtualBox or KVM 1. Sign in to [Oracle Container Registry](https://container-registry.oracle.com) and accept the _Oracle Standard Terms and Restrictions_ for the _Container Services_ Business Area. From 963f88d7f184ae12fe75d5959cac1ef9145d2eb6 Mon Sep 17 00:00:00 2001 From: Sergio Leunissen Date: Thu, 11 Jun 2020 12:53:39 +0200 Subject: [PATCH 5/7] Fix URL typo --- ContainerRegistry/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ContainerRegistry/README.md b/ContainerRegistry/README.md index 97268bc6..ba1dbd5b 100644 --- a/ContainerRegistry/README.md +++ b/ContainerRegistry/README.md @@ -6,7 +6,7 @@ It can be used as cache for the Oracle Container Registry, in particular for the Kubernetes containers. ## Prerequisites -1. Read the [prerequisites in the top level README](/vgrant-projects#prerequisites) to set up either Vagrant with either VirtualBox or KVM +1. Read the [prerequisites in the top level README](/vagrant-projects#prerequisites) to set up either Vagrant with either VirtualBox or KVM 1. Sign in to [Oracle Container Registry](https://container-registry.oracle.com) and accept the _Oracle Standard Terms and Restrictions_ for the _Container Services_ Business Area. From fafa111f5e9183d3d43f03f0b6188103ef4074fe Mon Sep 17 00:00:00 2001 From: Sergio Leunissen Date: Thu, 11 Jun 2020 16:08:31 +0200 Subject: [PATCH 6/7] Fix relative URL to top level README.md --- ContainerRegistry/README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ContainerRegistry/README.md b/ContainerRegistry/README.md index ba1dbd5b..7541d084 100644 --- a/ContainerRegistry/README.md +++ b/ContainerRegistry/README.md @@ -1,19 +1,19 @@ # Vagrant project to run a local Container Registry on Oracle Linux 7 -This simple Vagrantfile will provision an Oracle Linux 7 VM running a local +This Vagrant project will provision an Oracle Linux 7 VM running a local Container Registry. It can be used as cache for the Oracle Container Registry, in particular for the Kubernetes containers. ## Prerequisites -1. Read the [prerequisites in the top level README](/vagrant-projects#prerequisites) to set up either Vagrant with either VirtualBox or KVM +1. Read the [prerequisites in the top level README](../README.md#prerequisites) to set up either Vagrant with either VirtualBox or KVM 1. Sign in to [Oracle Container Registry](https://container-registry.oracle.com) and accept the _Oracle Standard Terms and Restrictions_ for the _Container Services_ Business Area. ## Quick start 1. Clone this repository `git clone https://github.com/oracle/vagrant-projects` -1. Change into the `vagrant-boxes/ContainerRegistry` folder +1. Change into the `vagrant-projects/ContainerRegistry` directory 1. Run `vagrant up; vagrant ssh` Your local container registry is up and running! @@ -27,7 +27,7 @@ There are several ways to set parameters: 1. Update the Vagrantfile. This is straightforward; the downside is that you will loose changes when you update this repository. 1. Use environment variables. Might be difficult to remember the parameters -used when the box was instantiated. +used when the VM was instantiated. 1. Use the `.env`/`.env.local` files (requires [vagrant-env](https://github.com/gosuri/vagrant-env) plugin). Configure your Registry by editing the `.env` file; or better copy `.env` to `.env.local` From 5b0feaf9c75c7fdb75cbdbc86e993d28f919c6ed Mon Sep 17 00:00:00 2001 From: Sergio Leunissen Date: Thu, 11 Jun 2020 16:09:57 +0200 Subject: [PATCH 7/7] Replace "software" with "project" --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f778b97b..e81ff782 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ All projects in this repository require Vagrant and either Oracle VM VirtualBox ## Getting started 1. Clone this repository `git clone https://github.com/oracle/vagrant-projects` -2. Change into the desired software folder +2. Change into the desired project folder 3. Follow the README.md instructions inside the folder ## Feedback