Skip to content

Commit

Permalink
geerlingguy.docker_arm is deprecated just use geerlingguy.docker
Browse files Browse the repository at this point in the history
  • Loading branch information
unkcpz committed Dec 20, 2023
1 parent 88b3b1c commit 1a8a619
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 27 deletions.
2 changes: 1 addition & 1 deletion docs/developers/build-apple-silicon.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ The VirtualBox software is not yet available for Apple Silicon, so we need to us
- During import and setup from ISO, select settings with: 64GB disk space (default), 4096MB RAM (default), 4 (works for 2020 macbook air so should be good for other later model) cores.
- Remember to install OpenSSH server during setup, so we can ssh to the VM for ansible deployment.
- Create system user `max` with password `moritz` and enable auto login. This will be used for ansible deployment.
- Create a new network setting with type "Emulated VLAN" and forward port 22 to 2200 of localhost so you can ssh to VM from localhost.
- Create (be careful not delete the existing one, it is used for connecting the internet) a new network setting with type "Emulated VLAN" and forward port 22 to 2200 of localhost so you can ssh to VM from localhost.

<img src="images/utm_ports_mapping.png" width="350px">

Expand Down
28 changes: 2 additions & 26 deletions local/tasks/docker.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,9 @@
#- name: Include geerlingguy.docker role
# include_role:
# name: geerlingguy.docker
# vars:
# docker_users: "{{ vm_user }}"
# docker_compose_version: "{{ vm_docker_compose_version }}"
# when: ansible_architecture == 'x86_64'
#
#- name: install recent docker and docker-compose python libraries
# become: True
# pip:
# name: "{{ item }}"
# state: present
# with_items:
# - docker
- name: Install docker (amd64)
- name: Install docker
include_role:
name: geerlingguy.docker
vars:
docker_users:
- "{{ vm_user }}"
when: ansible_architecture == 'x86_64'

- name: Install docker (arm64)
include_role:
name: geerlingguy.docker_arm
vars:
docker_users:
- "{{ vm_user }}"
when: ansible_architecture == 'aarch64'
- "{{ vm_user }}"

Check failure on line 6 in local/tasks/docker.yml

View workflow job for this annotation

GitHub Actions / pre-commit

6:7 [indentation] wrong indentation: expected 4 but found 6

- name: Install docker pip
include_role:
Expand Down

0 comments on commit 1a8a619

Please sign in to comment.