diff --git a/README.md b/README.md index 8d0434a..c63f69e 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ gitlab_ci_runner::runner_defaults: url: "https://git.example.com/ci" registration-token: "1234567890abcdef" executor: "docker" - docker-image: "ubuntu:trusty" + docker-image: "ubuntu:focal" builds_dir: "/tmp" cache_dir: "/tmp" ``` diff --git a/manifests/init.pp b/manifests/init.pp index 532a105..aa64af2 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -68,9 +68,9 @@ ensure_packages($xz_package_name) $docker_images = { - ubuntu_trusty => { + ubuntu_focal => { image => 'ubuntu', - image_tag => 'trusty', + image_tag => 'focal', }, } diff --git a/spec/classes/gitlab_ci_runner_spec.rb b/spec/classes/gitlab_ci_runner_spec.rb index 7ced2b4..4c5bdd0 100644 --- a/spec/classes/gitlab_ci_runner_spec.rb +++ b/spec/classes/gitlab_ci_runner_spec.rb @@ -184,9 +184,9 @@ is_expected.to contain_class('docker::images'). with( images: { - 'ubuntu_trusty' => { + 'ubuntu_focal' => { 'image' => 'ubuntu', - 'image_tag' => 'trusty' + 'image_tag' => 'focal' } } )