From 64f993ff69e1800142986c1fa4a975aa1ab2dd32 Mon Sep 17 00:00:00 2001 From: Francesco Manzali Date: Tue, 30 Aug 2022 12:27:36 +0200 Subject: [PATCH] - Update VMs to ubuntu/focal64 20.04 LTS (trusty64 reaced EOL on April 25 2019) - Update Docker installation task from the [official docs](https://docs.docker.com/engine/install/ubuntu/) --- prepare-local/provisioning.yml | 45 ++++++++++++---------------------- prepare-local/vagrant.yml | 6 +---- 2 files changed, 17 insertions(+), 34 deletions(-) diff --git a/prepare-local/provisioning.yml b/prepare-local/provisioning.yml index cbad0e6f..633e1b2d 100644 --- a/prepare-local/provisioning.yml +++ b/prepare-local/provisioning.yml @@ -1,11 +1,10 @@ --- - hosts: nodes - sudo: true + become: yes vars_files: - vagrant.yml tasks: - - name: clean up the home folder file: path: /home/vagrant/{{ item }} @@ -24,25 +23,23 @@ - name: installing dependencies apt: - name: apt-transport-https,ca-certificates,python-pip,tmux + name: apt-transport-https,ca-certificates,python3-pip,tmux state: present update_cache: true - name: fetching docker repo key apt_key: - keyserver: hkp://p80.pool.sks-keyservers.net:80 - id: 58118E89F3A912897C070ADBF76221572C52609D - - - name: adding package repos - apt_repository: - repo: "{{ item }}" + url: https://download.docker.com/linux/ubuntu/gpg + state: present + + - name: adding docker repo + apt_repository: + repo: deb https://download.docker.com/linux/ubuntu focal stable state: present - with_items: - - deb https://apt.dockerproject.org/repo ubuntu-trusty main - name: installing docker apt: - name: docker-engine + name: docker-ce,docker-ce-cli,containerd.io,docker-compose-plugin state: present update_cache: true @@ -56,7 +53,7 @@ lineinfile: dest: /etc/default/docker line: DOCKER_OPTS="--host=unix:///var/run/docker.sock --host=tcp://0.0.0.0:55555" - regexp: '^#?DOCKER_OPTS=.*$' + regexp: "^#?DOCKER_OPTS=.*$" state: present register: docker_opts @@ -66,22 +63,14 @@ state: restarted when: docker_opts is defined and docker_opts.changed - - name: performing pip autoupgrade - pip: - name: pip - state: latest - - - name: installing virtualenv - pip: - name: virtualenv - state: latest - - - name: Install Docker Compose via PIP - pip: name=docker-compose + - name: install docker-compose from official github repo + get_url: + url: https://github.com/docker/compose/releases/download/1.29.2/docker-compose-Linux-x86_64 + dest: /usr/local/bin/docker-compose + mode: "u+x,g+x" - name: - file: - path="/usr/local/bin/docker-compose" + file: path="/usr/local/bin/docker-compose" state=file mode=0755 owner=vagrant @@ -128,5 +117,3 @@ line: "127.0.0.1 localhost {{ inventory_hostname }}" - regexp: '^127\.0\.1\.1' line: "127.0.1.1 {{ inventory_hostname }}" - - diff --git a/prepare-local/vagrant.yml b/prepare-local/vagrant.yml index a65ca59e..8456c957 100644 --- a/prepare-local/vagrant.yml +++ b/prepare-local/vagrant.yml @@ -1,13 +1,12 @@ --- vagrant: - default_box: ubuntu/trusty64 + default_box: ubuntu/focal64 default_box_check_update: true ssh_insert_key: false min_memory: 256 min_cores: 1 instances: - - hostname: node1 private_ip: 10.10.10.10 memory: 1512 @@ -37,6 +36,3 @@ instances: private_ip: 10.10.10.50 memory: 512 cores: 1 - - -