diff options
| author | Christopher Baines <mail@cbaines.net> | 2018-07-03 23:19:12 +0100 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2018-07-04 10:03:43 +0100 |
| commit | 954cf7fcdba099fd849dc9de57138313bf1d229d (patch) | |
| tree | 0d1ec45402ec1a7e7de0b674af39c297354cb9d3 | |
| parent | c1b4bf80f947c8698cc917f13ef1497569785c9c (diff) | |
| download | govuk-mini-environment-admin-954cf7fcdba099fd849dc9de57138313bf1d229d.tar govuk-mini-environment-admin-954cf7fcdba099fd849dc9de57138313bf1d229d.tar.gz | |
Use bash from Guix when fetching revisions remotely
| -rw-r--r-- | app/jobs/govuk_guix/fetch_revision_job.rb | 4 | ||||
| -rw-r--r-- | terraform/aws/backend/main.tf | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/jobs/govuk_guix/fetch_revision_job.rb b/app/jobs/govuk_guix/fetch_revision_job.rb index 63a1f04..42177ff 100644 --- a/app/jobs/govuk_guix/fetch_revision_job.rb +++ b/app/jobs/govuk_guix/fetch_revision_job.rb @@ -35,6 +35,10 @@ class GovukGuix::FetchRevisionJob < Que::Job sha = fetch_and_checkout(commit_hash, remote_host) command = [ + # Use bash from Guix if running remotely, as bash on Ubuntu + # seems to handle grouping arguments differently, which breaks + # guix-pre-inst-env + *(remote_host.nil? ? [] : '/home/ubuntu/.guix-profile/bin/bash'), "#{@repository_directory}/guix-pre-inst-env", 'guix', 'build', diff --git a/terraform/aws/backend/main.tf b/terraform/aws/backend/main.tf index 29e07cb..458bfaa 100644 --- a/terraform/aws/backend/main.tf +++ b/terraform/aws/backend/main.tf @@ -309,7 +309,7 @@ EOF if [ ! -d "/var/guix/profiles/per-user/ubuntu" ]; then cp -r /var/guix/profiles/per-user/root/guix-profile-1-link /var/guix/profiles/per-user/ubuntu/ ln -s /var/guix/profiles/per-user/ubuntu/guix-profile-1-link /var/guix/profiles/per-user/ubuntu/guix-profile - /var/guix/profiles/per-user/ubuntu/guix-profile/bin/guix package -i guile + /var/guix/profiles/per-user/ubuntu/guix-profile/bin/guix package -i guile bash fi ln -s /var/guix/profiles/per-user/ubuntu/guix-profile ~/.guix-profile EOF |