diff options
| author | EuAndreh <eu@euandre.org> | 2019-06-09 21:22:26 -0300 |
|---|---|---|
| committer | EuAndreh <eu@euandre.org> | 2019-06-09 21:22:26 -0300 |
| commit | ee83db4ea78ecfd9d86ff51e4bf63fb372ffe600 (patch) | |
| tree | ff2aa3ac2f66c41fd9005d6a37bb07474b131180 | |
| parent | Create Terraform plan before shutting down running containers (diff) | |
| download | toph-ee83db4ea78ecfd9d86ff51e4bf63fb372ffe600.tar.gz toph-ee83db4ea78ecfd9d86ff51e4bf63fb372ffe600.tar.xz | |
Don't use terraform-full derivation
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | default.nix | 4 | ||||
| -rwxr-xr-x | scripts/ci/provision.sh | 4 |
3 files changed, 3 insertions, 6 deletions
@@ -1,5 +1,6 @@ # Terraform /.terraform/ +/terraform-provider-godaddy # Nix /result diff --git a/default.nix b/default.nix index d9b5c0d..35eead8 100644 --- a/default.nix +++ b/default.nix @@ -10,8 +10,6 @@ let sha256 = "00blqsan74s53dk9ab4hxi1kzxi46k57dr65dmbiradfa3yz3852"; }; modSha256 = "0p81wqw2n8vraxk20xwg717582ijwq2k7v5j3n13y4cd5bxd8hhz"; - postInstall = - "mv $out/bin/terraform-godaddy $out/bin/terraform-provider-godaddy"; }; in rec { utils = import ./utils.nix { @@ -55,7 +53,7 @@ in rec { gettext terraform-providers.digitalocean terraform-godaddy - terraform-full + terraform ansible ]; buildPhase = '' diff --git a/scripts/ci/provision.sh b/scripts/ci/provision.sh index 9e5bfcc..cdd357e 100755 --- a/scripts/ci/provision.sh +++ b/scripts/ci/provision.sh @@ -9,9 +9,7 @@ VPS_COMMIT_SHA="$(git rev-parse HEAD)" export VPS_COMMIT_SHA echo "Initializing Terraform..." -TF_PLUGINS_DIR='terraform.d/plugins/linux_amd64/' -mkdir -p "${TF_PLUGINS_DIR}" -ln -s "$(command -v terraform-provider-godaddy)" "${TF_PLUGINS_DIR}/terraform-provider-goddady" +ln -s "$(command -v terraform-godaddy)" terraform-provider-godaddy terraform --version terraform init echo "Done." |