chore(gcb build): remove a symlink (#543)

There was a symlink `rosco-web/config/packer -> halconfig/packer`. But GCB doesn't play well with symlinks. It uploads it as an empty directory instead. While the symlink is nice, it's not particularly important, so I just removed it. I put the files in `halconfig/packer` and reference them there in the build script and dockerfiles.
spinnaker · Feb 26, 2020 · b883c48 · b883c48
1 parent bd12136
commit b883c48
Show file tree

Hide file tree

Showing 24 changed files with 5 additions and 6 deletions.
diff --git a/Dockerfile.java8 b/Dockerfile.java8
@@ -2,7 +2,7 @@ FROM alpine:3.11
 MAINTAINER sig-platform@spinnaker.io
 COPY rosco-web/build/install/rosco /opt/rosco
 COPY rosco-web/config              /opt/rosco
-COPY rosco-web/config/packer       /opt/rosco/config/packer
+COPY halconfig/packer              /opt/rosco/config/packer
 
 WORKDIR /packer
 

diff --git a/Dockerfile.slim b/Dockerfile.slim
@@ -2,7 +2,7 @@ FROM alpine:3.11
 MAINTAINER sig-platform@spinnaker.io
 COPY rosco-web/build/install/rosco /opt/rosco
 COPY rosco-web/config              /opt/rosco
-COPY rosco-web/config/packer       /opt/rosco/config/packer
+COPY halconfig/packer              /opt/rosco/config/packer
 
 WORKDIR /packer
 

diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
@@ -2,7 +2,7 @@ FROM ubuntu:bionic
 MAINTAINER sig-platform@spinnaker.io
 COPY rosco-web/build/install/rosco /opt/rosco
 COPY rosco-web/config              /opt/rosco
-COPY rosco-web/config/packer       /opt/rosco/config/packer
+COPY halconfig/packer              /opt/rosco/config/packer
 
 WORKDIR /packer
 

diff --git a/Dockerfile.ubuntu-java8 b/Dockerfile.ubuntu-java8
@@ -2,7 +2,7 @@ FROM ubuntu:bionic
 MAINTAINER sig-platform@spinnaker.io
 COPY rosco-web/build/install/rosco /opt/rosco
 COPY rosco-web/config              /opt/rosco
-COPY rosco-web/config/packer       /opt/rosco/config/packer
+COPY halconfig/packer              /opt/rosco/config/packer
 
 WORKDIR /packer
 

diff --git a/halconfig/packer b/halconfig/packer
diff --git a/rosco-web/config/packer/alicloud-multi.json → halconfig/packer/alicloud-multi.json b/rosco-web/config/packer/alicloud-multi.json → halconfig/packer/alicloud-multi.json
diff --git a/rosco-web/config/packer/alicloud.json → halconfig/packer/alicloud.json b/rosco-web/config/packer/alicloud.json → halconfig/packer/alicloud.json
diff --git a/rosco-web/config/packer/aws-chroot.json → halconfig/packer/aws-chroot.json b/rosco-web/config/packer/aws-chroot.json → halconfig/packer/aws-chroot.json
diff --git a/rosco-web/config/packer/aws-ebs.json → halconfig/packer/aws-ebs.json b/rosco-web/config/packer/aws-ebs.json → halconfig/packer/aws-ebs.json
diff --git a/...o-web/config/packer/aws-multi-chroot.json → halconfig/packer/aws-multi-chroot.json b/...o-web/config/packer/aws-multi-chroot.json → halconfig/packer/aws-multi-chroot.json
diff --git a/rosco-web/config/packer/aws-multi-ebs.json → halconfig/packer/aws-multi-ebs.json b/rosco-web/config/packer/aws-multi-ebs.json → halconfig/packer/aws-multi-ebs.json
diff --git a/...eb/config/packer/aws-windows-2012-r2.json → halconfig/packer/aws-windows-2012-r2.json b/...eb/config/packer/aws-windows-2012-r2.json → halconfig/packer/aws-windows-2012-r2.json
diff --git a/rosco-web/config/packer/azure-linux.json → halconfig/packer/azure-linux.json b/rosco-web/config/packer/azure-linux.json → halconfig/packer/azure-linux.json
diff --git a/.../config/packer/azure-windows-2012-r2.json → halconfig/packer/azure-windows-2012-r2.json b/.../config/packer/azure-windows-2012-r2.json → halconfig/packer/azure-windows-2012-r2.json
diff --git a/rosco-web/config/packer/docker.json → halconfig/packer/docker.json b/rosco-web/config/packer/docker.json → halconfig/packer/docker.json
diff --git a/rosco-web/config/packer/gce.json → halconfig/packer/gce.json b/rosco-web/config/packer/gce.json → halconfig/packer/gce.json
diff --git a/rosco-web/config/packer/huaweicloud.json → halconfig/packer/huaweicloud.json b/rosco-web/config/packer/huaweicloud.json → halconfig/packer/huaweicloud.json
diff --git a/rosco-web/config/packer/install_packages.sh → halconfig/packer/install_packages.sh b/rosco-web/config/packer/install_packages.sh → halconfig/packer/install_packages.sh
diff --git a/rosco-web/config/packer/oci.json → halconfig/packer/oci.json b/rosco-web/config/packer/oci.json → halconfig/packer/oci.json
diff --git a/...aws-windows-2012-configure-ec2service.ps1 → ...aws-windows-2012-configure-ec2service.ps1 b/...aws-windows-2012-configure-ec2service.ps1 → ...aws-windows-2012-configure-ec2service.ps1
diff --git a/...onfig/packer/scripts/aws-windows.userdata → ...onfig/packer/scripts/aws-windows.userdata b/...onfig/packer/scripts/aws-windows.userdata → ...onfig/packer/scripts/aws-windows.userdata
diff --git a/.../scripts/windows-configure-chocolatey.ps1 → .../scripts/windows-configure-chocolatey.ps1 b/.../scripts/windows-configure-chocolatey.ps1 → .../scripts/windows-configure-chocolatey.ps1
diff --git a/...cker/scripts/windows-install-packages.ps1 → ...cker/scripts/windows-install-packages.ps1 b/...cker/scripts/windows-install-packages.ps1 → ...cker/scripts/windows-install-packages.ps1
diff --git a/rosco-web/rosco-web.gradle b/rosco-web/rosco-web.gradle
@@ -31,7 +31,7 @@ dependencies {
 
 if (project.plugins.hasPlugin('spinnaker.package')) {
   ospackage {
-    from('config/packer') {
+    from('../halconfig/packer') {
       into '/opt/rosco/config/packer'
     }