Commit Graph

110 Commits

Author SHA1 Message Date
Omkar Kawade
12ad263ef6 435 Update apt key ansible task 2023-11-16 20:23:52 -08:00
Omkar Kawade
1dca07177f 434 Add GPG keys to keyrings instead of trusted.gpg.d 2023-11-16 18:59:51 -08:00
Yethal
a76a05024a
Uninstall docker.io on apt distros 2023-11-10 16:20:54 +01:00
Jeff Geerling
9d51ec8802
Merge pull request #424 from rpetti/fix-runc-conflict-on-rhel
remove runc, as it conflicts with containerd
2023-09-28 16:53:38 +00:00
Rob Petti
95d13bf2b8 remove runc, as it conflicts with containerd 2023-09-27 23:16:32 -06:00
Aram Akhavan
fcbd3d7098
Merge branch 'master' into new_defaults 2023-09-27 14:41:20 -07:00
nevart
7c86fe1739 APT key: don't force and provide checksum, to fix check mode
As described in https://github.com/ansible/ansible/issues/65687, get_url
only partially supports check_mode: "the changed status will reflect
comparison to an empty source file".

Before this change, executing this code, with the key already being in
place on the target system, would report "OK", while check_mode would
report "changed".

Due to this change, both now either report "OK" or "changed", depending
on the state of the target system.
2023-06-26 07:34:10 +00:00
Aram Akhavan
d64f9afe19 add filename option to apt repository add 2023-02-21 22:35:04 -08:00
aurelien-bareille
0ad2ddd2c6 Include repository setup dependancies in flag scope 2022-12-14 18:25:29 +01:00
aurelien-bareille
8b623b2266 Add flag to deactivate repository configuration 2022-12-14 16:31:46 +01:00
Jeff Geerling
03d5bd6d06 Remove deprecated warn arg from command and shell module invocations. 2022-11-26 22:51:49 -06:00
berthin
3800fd2d42
Fix condition for empty docker compose svn 2022-11-05 11:20:04 +01:00
Jeff Geerling
6f636dc579
Merge pull request #373 from sosheskaz/fix-gpg
Download apt key directly
2022-09-08 17:34:14 -05:00
Jeff Geerling
928fe893e9 PR #370: Style cleanup. 2022-09-05 21:32:10 -05:00
Eric Miller
f463bb2c1a Download apt key directly
Fixes issue #372
2022-09-05 17:55:21 -05:00
Kevin Fardel
0884ae21b8 reset ssh connection to allow user changes to affect 'current login user'
Why:
Without this modification, we can't use docker with docker_users in same
playbook than the one which install docker.

How:
Check that docker_users are set and not in docker group before include
docker-users.yml. In docker-users.yml we call reset_connection from
ansible.builtin.meta collection after docker-users are added to docker
group.

Manual success tests:
* Try to install docker with only one user in docker-users and not in
  docker group => docker-users.yml include
* Try to install docker with only one user in docker-users but the user
  is in docker group => docker-users.yml not include
* Try to install docker with 2 users in docker-users, one user in docker
  group and the second not => docker-users.yml include
* Try to install docker with 2 users in docker-users, both are in docker
  group => docker-users.yml not include
* Try to install docker with 2 users in docker-users, both are not in
  docker group => docker-users.yml include
2022-08-24 17:07:45 +02:00
Jeff Geerling
53c5490523 PR #320: Use main.yml instead of default.yml for vars defaults. 2022-08-19 14:13:01 -05:00
Jeff Geerling
d3fcc22713
Merge pull request #320 from adamus1red/adamus1red/os-vars
Add OS specific variable overrides.
2022-08-19 14:09:16 -05:00
Jeff Geerling
93eef333bc
Update tasks/main.yml 2022-08-19 14:09:04 -05:00
Jeff Geerling
f78eb9d639
Update tasks/main.yml 2022-08-19 14:09:00 -05:00
Jeff Geerling
11345ab410
Merge pull request #365 from j-koehler/i205-install-docker-packages-explicitly
#205 - install Docker packages explicitly
2022-08-01 10:01:25 -05:00
Jeff Geerling
ccf6905017
Merge pull request #364 from kaysond/master
Add installation of docker plugin from docker's repo
2022-08-01 09:56:30 -05:00
Jeff Geerling
da9b7f78ee
Merge pull request #340 from jwhb/feature-service-manage
Allow skipping of service management
2022-08-01 09:55:50 -05:00
j.koehler
99e501c366 #205 - install Docker packages explicitly
following official Docker engine installation instructions
2022-07-14 12:16:39 +02:00
Aram Akhavan
028a764e83 add installation of docker plugin from repo 2022-07-05 19:39:39 -07:00
Matthew Daley
5d35e0208c Correct gnupg installation condition 2022-06-18 00:08:48 +12:00
Jeff Geerling
8453301f62
Merge pull request #356 from fgierlinger/fix/extra-ini-spaces
fix: remove extra spaces on enable option in ini files
2022-06-07 09:49:41 -05:00
fgierlinger
e42ed58e46
chore: change yes to true 2022-06-07 14:34:26 +02:00
fgierlinger
efebb627b9
fix: remove extra spaces on enable option in ini files 2022-06-07 14:30:22 +02:00
Andreas Motl
887eee43c7 Fix package downgrading for non-{RedHat,Debian} systems
Not all package install handlers implement the `allow_downgrade` option.
For example, using Ansible >= 2.12 on Arch Linux would croak like:

    Unsupported parameters for (ansible.legacy.pacman) module: allow_downgrade.
2022-05-24 23:29:09 +02:00
Norman Ziegner
c5f2b14d9a
Fix docker-compose update
Signed-off-by: Norman Ziegner <norman.ziegner@ufz.de>
2022-04-12 15:53:25 +02:00
jwhb
83e2c066c1 Allow skipping of service management 2022-04-07 11:23:29 +02:00
Bajal
a9fe63f768
Needs additional check 2022-04-04 21:01:36 -04:00
Bajal
b48741f289
Update conditional for docker-compose check 2022-04-04 20:46:43 -04:00
Jeff Geerling
cef4b7892e Attempt to fix some Docker compose version comparison bugs. 2022-04-04 10:32:17 -05:00
Jeff Geerling
13c293fe8d
Merge pull request #336 from crate-workbench/amo/allow-downgrades
Allow package downgrading
2022-04-04 09:40:22 -05:00
Andreas Motl
5fe0726d52 Allow package downgrading
For the "package" task, add "allow_downgrade: true" to support this
scenario.

Because this option is only available starting with `ansible-core>=2.12`
for apt-based systems, we need conditional dispatching here.
2022-03-30 20:06:17 +02:00
Julian Euler
c9e77fb0cf Revert "automatic architecture detection"
This reverts commit 32129135d7.
2022-01-26 17:34:10 +01:00
Julian Euler
bfba781af0 more robust compose version comparison 2022-01-26 17:27:53 +01:00
Julian Euler
32129135d7 automatic architecture detection 2022-01-26 17:27:31 +01:00
Kare Nuorteva
f6cd0ed3f8 style: fix ansible-lint nit about truthy value
yaml: truthy value should be one of [false, true] (truthy)
roles/geerlingguy.docker/tasks/docker-compose.yml:5

Fixes geerlingguy/ansible-role-docker#325
2022-01-13 19:20:24 +02:00
adamus1red
e60f04337d Add OS specific variable overrides.
Specifically Alpine official repo uses `docker` rather than `docker-ce` or `docker-ee`
2021-12-31 15:38:08 +00:00
Faustin Lammler
fcb1f461c0
Remove sudo dependency
The sudo dependency should not be needed because sudo escalation is
managed by Ansible.
2021-10-30 12:53:30 +02:00
fabricat
a0ce4704b8
run check task even in check mode 2021-10-14 14:48:04 +02:00
Jeff Geerling
7afdc965a1
Merge pull request #256 from Zempashi/issue-90
Ability to configure Docker daemon options
2021-07-16 17:27:47 -05:00
Julien Girardin
47a271e39a Do not touch docker.json if not option provided 2021-07-16 23:29:40 +02:00
Eric Engstrom
cc1171a9f7
Add check and ignore installation errors in --check mode
- addresses #280
2021-05-19 11:39:47 -05:00
Eric Engstrom
150a7ce135
ignore likely errors if in ansible_check_mode 2021-04-20 11:16:09 -05:00
Volker Thiel
d061f2fefa
Fixed typo in log message 2021-03-26 10:19:45 +01:00
toxinu
09df8f5688
Add gnupg for systems >= Ubuntu 20.04 2021-03-24 11:26:04 +09:00