From 7755d0f3ffb9af17253417b029761ccd58c01995 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 13 Nov 2024 15:12:30 +0000 Subject: [PATCH 01/10] feat(Dependencies): Update dependency openstacksdk to v4.0.1 (#483) | datasource | package | from | to | | ---------- | ------------ | ----- | ----- | | pypi | openstacksdk | 4.0.0 | 4.0.1 | Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- packer/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer/requirements.txt b/packer/requirements.txt index 4f9f2e9..dc8b6d9 100644 --- a/packer/requirements.txt +++ b/packer/requirements.txt @@ -1,4 +1,4 @@ -openstacksdk==4.0.0 +openstacksdk==4.0.1 ansible==10.4.0 python-openstackclient==7.1.2 paramiko==3.5.0 From c2394676f7aa8d48fa1ac503cf4ad911c2d4885f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 13 Nov 2024 18:33:17 +0000 Subject: [PATCH 02/10] feat(Dependencies): Update dependency python-openstackclient to v7.1.3 (#479) | datasource | package | from | to | | ---------- | ---------------------- | ----- | ----- | | pypi | python-openstackclient | 7.1.2 | 7.1.3 | Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- packer/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer/requirements.txt b/packer/requirements.txt index dc8b6d9..36617d2 100644 --- a/packer/requirements.txt +++ b/packer/requirements.txt @@ -1,5 +1,5 @@ openstacksdk==4.0.1 ansible==10.4.0 -python-openstackclient==7.1.2 +python-openstackclient==7.1.3 paramiko==3.5.0 passlib==1.7.4 From 689cbb18d2e82f6943865e757447100f2f2564f0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 18 Nov 2024 18:09:13 +0000 Subject: [PATCH 03/10] feat(Dependencies): Update dependency coder/code-server to v4.95.3 (#500) | datasource | package | from | to | | ----------- | ----------------- | ------- | ------- | | github-tags | coder/code-server | v4.95.2 | v4.95.3 | Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/vscode_metadata.yml | 2 +- vscode/vscode_vars_file.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vscode/vscode_metadata.yml b/vscode/vscode_metadata.yml index 8e920ab..408cf56 100644 --- a/vscode/vscode_metadata.yml +++ b/vscode/vscode_metadata.yml @@ -18,4 +18,4 @@ wiki_link: "" logo_url: "https://cloud.denbi.de/static/images/vscode.png" info_url: "" information_for_display: - version: v4.95.2 + version: v4.95.3 diff --git a/vscode/vscode_vars_file.yml b/vscode/vscode_vars_file.yml index 8bbc350..cfe4e63 100644 --- a/vscode/vscode_vars_file.yml +++ b/vscode/vscode_vars_file.yml @@ -1,6 +1,6 @@ --- vscode_vars: INSTALL_SCRIPT_URL: https://code-server.dev/install.sh - VSCODE_VERSION: v4.95.2 + VSCODE_VERSION: v4.95.3 DEFAULT_USER: ubuntu PORT: 3000 From db9aeeb0393d346692f67609adcc878aec2becf0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2024 21:04:34 +0000 Subject: [PATCH 04/10] feat(Dependencies): Update dependency geerlingguy.docker to v7.4.2 (#502) | datasource | package | from | to | | ---------- | ------------------ | ----- | ----- | | galaxy | geerlingguy.docker | 7.4.1 | 7.4.2 | Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- packer/requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer/requirements.yml b/packer/requirements.yml index 3a9f038..0378519 100644 --- a/packer/requirements.yml +++ b/packer/requirements.yml @@ -10,7 +10,7 @@ roles: version: v6.4.0 - name: geerlingguy.docker - version: 7.4.1 + version: 7.4.2 - name: autoscaling src: https://github.com/deNBI/autoscaling-ansible From 59ac0d9e953ff1534c60d343e8072f8ffab19356 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2024 22:27:27 +0000 Subject: [PATCH 05/10] feat(Dependencies): Update dependency geerlingguy.docker to v7.4.3 (#503) | datasource | package | from | to | | ---------- | ------------------ | ----- | ----- | | galaxy | geerlingguy.docker | 7.4.2 | 7.4.3 | Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- packer/requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer/requirements.yml b/packer/requirements.yml index 0378519..e92117a 100644 --- a/packer/requirements.yml +++ b/packer/requirements.yml @@ -10,7 +10,7 @@ roles: version: v6.4.0 - name: geerlingguy.docker - version: 7.4.2 + version: 7.4.3 - name: autoscaling src: https://github.com/deNBI/autoscaling-ansible From fad8ab6ac0ec401b3b8d1c59bd1ac26558e5e4c7 Mon Sep 17 00:00:00 2001 From: dweinholz Date: Tue, 26 Nov 2024 15:53:33 +0100 Subject: [PATCH 06/10] added docker to generic --- .ansible-lint | 1 - emgb/emgb.yml | 7 ---- generic/generic_pre_tasks.yml | 3 ++ generic/setup_docker.yml | 72 +++++++++++++++++++++++++++++++++++ packer/requirements.yml | 3 -- 5 files changed, 75 insertions(+), 11 deletions(-) create mode 100644 generic/setup_docker.yml diff --git a/.ansible-lint b/.ansible-lint index f6ad852..e68b538 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -39,7 +39,6 @@ skip_list: - risky-file-permissions mock_roles: - - geerlingguy.docker - autoscaling mock_modules: diff --git a/emgb/emgb.yml b/emgb/emgb.yml index 5777b6a..491a16c 100644 --- a/emgb/emgb.yml +++ b/emgb/emgb.yml @@ -6,13 +6,6 @@ name: python-is-python3 state: present -- name: Install Docker role - include_role: - name: geerlingguy.docker - vars: - docker_users: - - ubuntu - docker_compose_package: docker-compose-plugin - name: Install yq ansible.builtin.shell: | diff --git a/generic/generic_pre_tasks.yml b/generic/generic_pre_tasks.yml index dd62de7..975d95c 100644 --- a/generic/generic_pre_tasks.yml +++ b/generic/generic_pre_tasks.yml @@ -45,3 +45,6 @@ ansible.builtin.apt: name: python3-pip state: latest + +- name: Setup Docker + ansible.builtin.import_tasks: ../generic/setup_docker.yml diff --git a/generic/setup_docker.yml b/generic/setup_docker.yml new file mode 100644 index 0000000..01a853b --- /dev/null +++ b/generic/setup_docker.yml @@ -0,0 +1,72 @@ +--- +- name: Update and upgrade all packages to the latest version + ansible.builtin.apt: + update_cache: true + upgrade: dist + cache_valid_time: 3600 +- name: Install required packages + + ansible.builtin.apt: + pkg: + - apt-transport-https + - ca-certificates + - curl + - gnupg + - software-properties-common + +- name: Create directory for Docker's GPG key + ansible.builtin.file: + path: /etc/apt/keyrings + state: directory + mode: "0755" + +- name: Add Docker's official GPG key + ansible.builtin.apt_key: + url: https://download.docker.com/linux/ubuntu/gpg + keyring: /etc/apt/keyrings/docker.gpg + state: present + +- name: Print architecture variables + ansible.builtin.debug: + msg: "Architecture: {{ ansible_architecture }}, Codename: {{ ansible_lsb.codename }}" + +- name: Add Docker repository + ansible.builtin.apt_repository: + repo: >- + deb [arch={{ arch_mapping[ansible_architecture] | default(ansible_architecture) }} + signed-by=/etc/apt/keyrings/docker.gpg] + https://download.docker.com/linux/ubuntu {{ ansible_lsb.codename }} stable + filename: docker + state: present + +- name: Install Docker and related packages + ansible.builtin.apt: + name: "{{ item }}" + state: present + update_cache: true + loop: + - docker-ce + - docker-ce-cli + - containerd.io + - docker-buildx-plugin + - docker-compose-plugin + +- name: Add Docker group + ansible.builtin.group: + name: docker + state: present + +- name: Add user to Docker group + ansible.builtin.user: + name: "{{ ansible_user }}" + groups: docker + append: true + +- name: Enable and start Docker services + ansible.builtin.systemd: + name: "{{ item }}" + enabled: true + state: started + loop: + - docker.service + - containerd.service diff --git a/packer/requirements.yml b/packer/requirements.yml index 3a9f038..f28a71b 100644 --- a/packer/requirements.yml +++ b/packer/requirements.yml @@ -9,9 +9,6 @@ roles: - name: andrewrothstein.miniconda version: v6.4.0 - - name: geerlingguy.docker - version: 7.4.1 - - name: autoscaling src: https://github.com/deNBI/autoscaling-ansible version: 1.8.7 From b58ea0160b4207892554c32bf827142d6ace6274 Mon Sep 17 00:00:00 2001 From: dweinholz Date: Wed, 27 Nov 2024 08:40:26 +0100 Subject: [PATCH 07/10] added docker to generic --- generic/setup_docker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generic/setup_docker.yml b/generic/setup_docker.yml index 01a853b..12c52e0 100644 --- a/generic/setup_docker.yml +++ b/generic/setup_docker.yml @@ -4,8 +4,8 @@ update_cache: true upgrade: dist cache_valid_time: 3600 -- name: Install required packages +- name: Install required packages ansible.builtin.apt: pkg: - apt-transport-https @@ -29,7 +29,7 @@ - name: Print architecture variables ansible.builtin.debug: msg: "Architecture: {{ ansible_architecture }}, Codename: {{ ansible_lsb.codename }}" - + - name: Add Docker repository ansible.builtin.apt_repository: repo: >- From 6e7dd34246019852db5f9834e87ec029638d5c03 Mon Sep 17 00:00:00 2001 From: dweinholz Date: Wed, 27 Nov 2024 09:10:56 +0100 Subject: [PATCH 08/10] added docker to generic --- generic/setup_docker.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/generic/setup_docker.yml b/generic/setup_docker.yml index 12c52e0..8a1ee90 100644 --- a/generic/setup_docker.yml +++ b/generic/setup_docker.yml @@ -34,10 +34,13 @@ ansible.builtin.apt_repository: repo: >- deb [arch={{ arch_mapping[ansible_architecture] | default(ansible_architecture) }} - signed-by=/etc/apt/keyrings/docker.gpg] + signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu {{ ansible_lsb.codename }} stable filename: docker state: present + vars: + arch_mapping: + x86_64: amd64 - name: Install Docker and related packages ansible.builtin.apt: From c410f515c5be877e8eae95e9941bbb2a53d5cde9 Mon Sep 17 00:00:00 2001 From: dweinholz Date: Wed, 27 Nov 2024 09:51:52 +0100 Subject: [PATCH 09/10] added docker to generic --- generic/setup_docker.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/generic/setup_docker.yml b/generic/setup_docker.yml index 8a1ee90..d73b37e 100644 --- a/generic/setup_docker.yml +++ b/generic/setup_docker.yml @@ -1,4 +1,7 @@ --- +- name: Install and configure Docker on Ubuntu + become: true + - name: Update and upgrade all packages to the latest version ansible.builtin.apt: update_cache: true @@ -34,7 +37,7 @@ ansible.builtin.apt_repository: repo: >- deb [arch={{ arch_mapping[ansible_architecture] | default(ansible_architecture) }} - signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] + signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu {{ ansible_lsb.codename }} stable filename: docker state: present @@ -47,7 +50,7 @@ name: "{{ item }}" state: present update_cache: true - loop: + with_items: - docker-ce - docker-ce-cli - containerd.io @@ -70,6 +73,6 @@ name: "{{ item }}" enabled: true state: started - loop: + with_items: - docker.service - - containerd.service + - containerd.service \ No newline at end of file From 0d00d0d13fb6cc00a52c4696eaa027ee1c1a91f2 Mon Sep 17 00:00:00 2001 From: dweinholz Date: Wed, 27 Nov 2024 09:55:13 +0100 Subject: [PATCH 10/10] added docker to generic --- generic/setup_docker.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/generic/setup_docker.yml b/generic/setup_docker.yml index d73b37e..14a9718 100644 --- a/generic/setup_docker.yml +++ b/generic/setup_docker.yml @@ -1,7 +1,4 @@ --- -- name: Install and configure Docker on Ubuntu - become: true - - name: Update and upgrade all packages to the latest version ansible.builtin.apt: update_cache: true