Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace install deb script with Ansible tasks #2205

Merged
merged 3 commits into from
Sep 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -137,12 +137,10 @@ deb_packages:
- source: https://download1.rstudio.org/electron/jammy/amd64
filename: rstudio-2024.04.2-764-amd64.deb
sha256: 1d0bd2f54215f514a8a78a4d035c7804218bb8fafa417aa5083d341e174e6452
creates: /usr/bin/rstudio
noble:
- source: https://download1.rstudio.org/electron/jammy/amd64
filename: rstudio-2024.04.2-764-amd64.deb
sha256: 1d0bd2f54215f514a8a78a4d035c7804218bb8fafa417aa5083d341e174e6452
creates: /usr/bin/rstudio

snap_packages:
- name: codium
Expand Down
33 changes: 0 additions & 33 deletions data_safe_haven/resources/workspace/ansible/install_deb.sh

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---

- name: Fetch deb
ansible.builtin.get_url:
url: "{{ item.source }}/{{ item.filename }}"
dest: "/tmp/{{ item.filename }}"
checksum: "sha256:{{ item.sha256 }}"
mode: '0400'
register: debfile

- name: Install deb
ansible.builtin.apt:
deb: "{{ debfile.dest }}"
state: present
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,8 @@

- name: Install deb packages
tags: deb
ansible.builtin.script:
executable: /bin/bash
cmd: "/var/local/ansible/install_deb.sh {{ item.source }} {{ item.filename }} {{ item.sha256 }}"
creates: "{{ item.creates }}"
ansible.builtin.include_tasks:
file: tasks/install_deb.yaml
loop: "{{ deb_packages[ansible_facts.distribution_release] }}"

- name: Install snap packages
Expand Down
Loading