From 6cacfd9fa2e1b09f1a21303a8577ff5f1626fccb Mon Sep 17 00:00:00 2001 From: Eric Ball Date: Wed, 15 Jan 2020 18:51:10 -0800 Subject: [PATCH] Switch to tested golang module, remove ruby The previous golang module was not installing correctly on CentOS 7. The gantsign module has been tested as working. Ruby was only required for package_cloud, which is now installed in the base image. Since it was causing build problems, the explicit installation has been removed. Issue: LF-Jira IT-15893 Signed-off-by: Eric Ball Change-Id: Ia60c965b0ddf0f04f634ff8cd9d8ff16ec190938 --- packer/provision/local-docker.yaml | 13 +++---------- packer/requirements.yaml | 2 ++ 2 files changed, 5 insertions(+), 10 deletions(-) create mode 100644 packer/requirements.yaml diff --git a/packer/provision/local-docker.yaml b/packer/provision/local-docker.yaml index fd24d8dd..9a339605 100644 --- a/packer/provision/local-docker.yaml +++ b/packer/provision/local-docker.yaml @@ -12,14 +12,7 @@ tasks: - include_role: - name: fubarhouse.ruby + name: gantsign.golang vars: - ruby_version: 2.4.0 - ruby_packages: - - rake - - package_cloud - - - include_role: - name: fubarhouse.golang - vars: - go_version: 1.12 + golang_version: 1.12 + ansible_become: true diff --git a/packer/requirements.yaml b/packer/requirements.yaml new file mode 100644 index 00000000..a182919a --- /dev/null +++ b/packer/requirements.yaml @@ -0,0 +1,2 @@ +--- +- src: gantsign.golang -- 2.16.6