diff --git a/package-lock.json b/package-lock.json index 6066731..55c2ad0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "aws-semaphore-agent", - "version": "0.4.2", + "version": "0.5.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "aws-semaphore-agent", - "version": "0.4.2", + "version": "0.5.0", "dependencies": { "aws-cdk": "^2.164.1", "aws-cdk-lib": "^2.164.1", diff --git a/package.json b/package.json index 0a1e658..837ba03 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "aws-semaphore-agent", - "version": "0.4.2", + "version": "0.5.0", "bin": { "aws-semaphore-agent": "bin/aws-semaphore-agent.js" }, diff --git a/packer/linux/ansible/group_vars/all.yml b/packer/linux/ansible/group_vars/all.yml index 77efc77..32d7bd5 100644 --- a/packer/linux/ansible/group_vars/all.yml +++ b/packer/linux/ansible/group_vars/all.yml @@ -7,7 +7,8 @@ awscli_url: "https://awscli.amazonaws.com/awscli-exe-linux-x86_64-{{ awscli_vers docker_apt_repository: "deb [arch=amd64] https://download.docker.com/linux/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} stable" docker_apt_gpg_key: "https://download.docker.com/linux/{{ ansible_distribution | lower }}/gpg" yq_url: "https://github.com/mikefarah/yq/releases/download/v4.16.2/yq_linux_amd64" +erlang_gpg_key_url: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-erlang.E495BB49CC4BBE5B.key +erlang_gpg_key_checksum: "84df2e5fd80d464c3eb9acd2f751b2f6a723438200915dd50fbf12f08698e4ec" +erlang_gpg_key_path: /usr/share/keyrings/rabbitmq-erlang.E495BB49CC4BBE5B.asc cloudwatch_agent_url: https://s3.amazonaws.com/amazoncloudwatch-agent/ubuntu/amd64/latest/amazon-cloudwatch-agent.deb -erlang_apt_gpg_key: https://packages.erlang-solutions.com/ubuntu/erlang_solutions.asc -erlang_apt_repository: "deb [arch=amd64] https://packages.erlang-solutions.com/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} contrib" systemd_restart_seconds: 300 diff --git a/packer/linux/ansible/roles/erlang/tasks/main.yml b/packer/linux/ansible/roles/erlang/tasks/main.yml index c1e5715..4fc4580 100644 --- a/packer/linux/ansible/roles/erlang/tasks/main.yml +++ b/packer/linux/ansible/roles/erlang/tasks/main.yml @@ -1,19 +1,24 @@ --- -- name: Add Erlang GPG apt Key - when: install_erlang | bool - ansible.builtin.apt_key: - url: "{{ erlang_apt_gpg_key }}" +- name: Download GPG key + ansible.builtin.get_url: + url: "{{ erlang_gpg_key_url }}" + dest: "{{ erlang_gpg_key_path }}" + checksum: "sha256:{{ erlang_gpg_key_checksum }}" + mode: '0755' + force: true + +- name: "Add repository to APT sources list" + ansible.builtin.apt_repository: + repo: "deb [arch=amd64 signed-by={{ erlang_gpg_key_path }}] https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-erlang/deb/ubuntu focal main" state: present -- name: Add Erlang Repository - when: install_erlang | bool +- name: "Add src repository to APT sources list" ansible.builtin.apt_repository: - repo: "{{ erlang_apt_repository }}" + repo: "deb-src [signed-by={{ erlang_gpg_key_path }}] https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-erlang/deb/ubuntu focal main" state: present - update_cache: true - name: Install Erlang when: install_erlang | bool ansible.builtin.apt: pkg: - - erlang-base=1:24.3.3-1 + - erlang-base=1:24.3.4.17-1