diff options
author | Christopher Baines <mail@cbaines.net> | 2019-05-27 21:35:53 +0100 |
---|---|---|
committer | Christopher Baines <mail@cbaines.net> | 2019-05-30 08:33:03 +0100 |
commit | 859302774c4d719cf949f419d0efcfd8cbad6ca2 (patch) | |
tree | a83c053f6a0e95554ea30784caf2837eb6837179 /app/services | |
parent | 1acde9a21a50f4227930afb5b6b9eda1cace54b8 (diff) | |
download | govuk-mini-environment-admin-859302774c4d719cf949f419d0efcfd8cbad6ca2.tar govuk-mini-environment-admin-859302774c4d719cf949f419d0efcfd8cbad6ca2.tar.gz |
Add a new AWS backend using Amazon Machine Images
The existing AWS backend uses system containers backed on to the AWS
hosted NFS service (EFS). This has some advantages, but also some
disadvantages.
Using the EFS service allows building a container on one instance,
with the state being held on the EFS, and then launching a new
instance to run the container. Using EFS also provides persistence, at
least beyond individual EC2 instances.
However, build performance when using EFS is poor compared with a
local store without the overhead of the network latency. Additionally,
the startup speed of the container running off EFS is slow compared to
local storage.
This backend doesn't use EFS, instead the Guix store sits on instance
storage. Rather than using a system container for a Mini Environment,
an Amazon Machine Image (AMI) is built instead. The fast local storage
makes builds faster, and using EBS storage for the Mini Envirnoments
as well as not having the overhead of starting Ubuntu, then starting
the container also makes startup faster.
Diffstat (limited to 'app/services')
-rw-r--r-- | app/services/govuk_guix/build_mini_environment.rb | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/app/services/govuk_guix/build_mini_environment.rb b/app/services/govuk_guix/build_mini_environment.rb index 9cada20..a87c4da 100644 --- a/app/services/govuk_guix/build_mini_environment.rb +++ b/app/services/govuk_guix/build_mini_environment.rb @@ -72,12 +72,16 @@ module GovukGuix::BuildMiniEnvironment run_remotely_on_host: remote_host ) - build_output = output.last.strip - - raise 'InvalidOutput' unless build_output.starts_with? '/gnu/store' - + last_non_empty_line = output.reverse.find do |line| + !line.strip.empty? + end + build_output = last_non_empty_line.strip logger.debug(self.class) { "build_output: #{build_output}" } + unless options[:arguments][:type] == 'aws-packer-ami' + raise 'InvalidOutput' unless build_output.starts_with? '/gnu/store' + end + mini_environment.update( backend_data: { build_output: build_output |