Merge pull request #157 from sickcodes/helm-updates

Update helm chart to include link back to OG project. Dissolve testing branch references in favor of master.

7 files changed, 14 insertions, 12 deletions

diff --git a/Dockerfile b/Dockerfile
index f9570ab..01ff913 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -184,8 +184,10 @@ RUN if [[ "${LINUX}" == true ]]; then \
         && bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine." \
     ; fi
 
-# temporary branch, remove in final PR
-RUN git clone --branch custom-identity https://github.com/sickcodes/Docker-OSX.git
+# optional --build-arg to change branches for testing
+ARG BRANCH=master
+ARG REPO='https://github.com/sickcodes/Docker-OSX.git'
+RUN git clone --branch "${BRANCH}" "${REPO}"
 
 RUN touch Launch.sh \
     && chmod +x ./Launch.sh \
diff --git a/custom/generate-specific-bootdisk.sh b/custom/generate-specific-bootdisk.sh
index e87bf3c..76aff0c 100755
--- a/custom/generate-specific-bootdisk.sh
+++ b/custom/generate-specific-bootdisk.sh
@@ -138,8 +138,8 @@ download_qcow_efi_folder () {
 }
 
 generate_bootdisk () {
-    [[ -e ./config-nopicker-custom.plist ]] || wget https://raw.githubusercontent.com/sickcodes/Docker-OSX/custom-identity/custom/config-nopicker-custom.plist
-    [[ -e ./opencore-image-ng.sh ]] || wget https://raw.githubusercontent.com/sickcodes/Docker-OSX/custom-identity/custom/opencore-image-ng.sh && chmod +x opencore-image-ng.sh
+    [[ -e ./config-nopicker-custom.plist ]] || wget https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/custom/config-nopicker-custom.plist
+    [[ -e ./opencore-image-ng.sh ]] || wget https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/custom/opencore-image-ng.sh && chmod +x opencore-image-ng.sh
     # plist required for bootdisks, so create anyway.
     if [[ "${DEVICE_MODEL}" ]] \
             && [[ "${SERIAL}" ]] \
diff --git a/custom/generate-unique-machine-values.sh b/custom/generate-unique-machine-values.sh
index 4b2409a..2248005 100755
--- a/custom/generate-unique-machine-values.sh
+++ b/custom/generate-unique-machine-values.sh
@@ -183,8 +183,8 @@ download_qcow_efi_folder () {
 
 
 generate_serial_sets () {
-    [[ -e ./config-nopicker-custom.plist ]] || wget https://raw.githubusercontent.com/sickcodes/Docker-OSX/custom-identity/custom/config-nopicker-custom.plist
-    [[ -e ./opencore-image-ng.sh ]] || wget https://raw.githubusercontent.com/sickcodes/Docker-OSX/custom-identity/custom/opencore-image-ng.sh && chmod +x opencore-image-ng.sh
+    [[ -e ./config-nopicker-custom.plist ]] || wget https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/custom/config-nopicker-custom.plist
+    [[ -e ./opencore-image-ng.sh ]] || wget https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/custom/opencore-image-ng.sh && chmod +x opencore-image-ng.sh
     mkdir -p "${OUTPUT_DIRECTORY}/envs"
     export DATE_NOW="$(date +%F-%T)"
     export DEVICE_MODEL="${DEVICE_MODEL:=iMacPro1,1}"
diff --git a/helm/Chart.yaml b/helm/Chart.yaml
index 321db02..e22b41d 100644
--- a/helm/Chart.yaml
+++ b/helm/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "0.0.1.0"
 description: "Containerized OSX! Run OSX in a pod, headlessly, or with Xvfb. Test your Apps and master CI/CD processes."
 name: docker-osx
-version: 0.1.0
+version: 0.2.0
 keywords:
 - docker-osx
 - mac
diff --git a/helm/docker-osx-0.1.0.tgz b/helm/docker-osx-0.1.0.tgz
deleted file mode 100644
index 3756681..0000000
--- a/helm/docker-osx-0.1.0.tgz
+++ /dev/null
diff --git a/helm/docker-osx-0.2.0.tgz b/helm/docker-osx-0.2.0.tgz
new file mode 100644
index 0000000..897ef02
--- /dev/null
+++ b/helm/docker-osx-0.2.0.tgz
diff --git a/helm/index.yaml b/helm/index.yaml
index 4efc4de..61f5ddf 100644
--- a/helm/index.yaml
+++ b/helm/index.yaml
@@ -3,9 +3,9 @@ entries:
   docker-osx:
   - apiVersion: v1
     appVersion: 0.0.1.0
-    created: "2021-02-12T18:10:08.054368621Z"
+    created: "2021-02-27T04:15:48.784861502Z"
     description: Containerized OSX! Run OSX in a pod, headlessly, or with Xvfb. Test your Apps and master CI/CD processes.
-    digest: 04e88d78156fa1de709a3dad16558cb8f0bd1c1f0bde8144d530c9a0c143123a
+    digest: 5a62a9291b1494b9cfaa0708ab7bab9d13cca30adbeaced3d29a5bb6935caac9
     keywords:
     - docker-osx
     - mac
@@ -19,6 +19,6 @@ entries:
     - osx
     name: docker-osx
     urls:
-    - https://sickcodes.github.io/Docker-OSX/helm/docker-osx-0.1.0.tgz
-    version: 0.1.0
-generated: "2021-02-12T18:10:08.053067083Z"
+    - https://sickcodes.github.io/Docker-OSX/helm/docker-osx-0.2.0.tgz
+    version: 0.2.0
+generated: "2021-02-27T04:15:48.782073839Z"