Sebastiaan van Stijn
aca173ad8e
rootless-install.sh: update to 20.10.15
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2022-05-12 17:35:50 +02:00
Sebastiaan van Stijn
614d05e0e6
Merge pull request #291 from thaJeztah/install_update_containerd
...
Explicitly install containerd.io to handle upgrades
2022-05-12 15:45:58 +02:00
Sebastiaan van Stijn
a77c28b7fc
Explicitly install containerd.io to handle upgrades
...
While the script isn't intended for updating existing installations,
some users use it for that purpose, and when doing so may end up in
a situation where only the docker packages are updated, but containerd
is kept at the already installed version.
This patch explicitly installs the containerd.io package so that running
the script on an existing installation also updates the containerd.io
package to the latest version.
Docker packages before 18.09 bundled containerd in the docker-ce package,
so this step is made options based on the version that's requested to be
installed (defaults to "latest").
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2022-05-10 12:50:11 +02:00
Sebastiaan van Stijn
73bf6ca324
Merge pull request #289 from linux-on-ibm-z/sles-fix
...
Fix zypper command syntax
2022-05-06 19:56:46 +02:00
Prabhav Thali
f3ba5b5669
fix zypper command syntax
...
Signed-off-by: Prabhav Thali <Prabhav.Thali1@ibm.com >
2022-05-04 17:45:55 +05:30
Sebastiaan van Stijn
0221adedb4
Merge pull request #288 from thaJeztah/carry_add_compose_v2
...
Add docker-compose-plugin package
2022-04-26 12:31:45 +02:00
Debdut Chakraborty
90d0bdf7b6
Add docker-compose-plugin package
...
Signed-off-by: Debdut Chakraborty <debdut.chakraborty@rocket.chat >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2022-04-25 20:10:40 +02:00
Sebastiaan van Stijn
dad6f89598
Merge pull request #287 from thaJeztah/normalize_steps
...
align approach for packages to install between rpm and deb steps
2022-04-25 20:08:17 +02:00
Sebastiaan van Stijn
ab03892649
align approach for packages to install between rpm and deb steps
...
This aligns the approach taken between rpm- and deb-based installations to first
collect the list of packages to install in a `$pkgs` variable, and then install
them all, instead of executing an install for each of them.
With this change:
Fedora
DRY_RUN=1 ./install.sh
# Executing docker install script, commit:
dnf install -y -q dnf-plugins-core
dnf config-manager --add-repo https://download.docker.com/linux/fedora/docker-ce.repo
dnf makecache
dnf install -y -q docker-ce docker-ce-cli docker-scan-plugin docker-ce-rootless-extras
CentOS
DRY_RUN=1 ./install.sh
# Executing docker install script, commit:
yum install -y -q yum-utils
yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo
yum makecache
yum install -y -q docker-ce docker-ce-cli docker-scan-plugin docker-ce-rootless-extras
Ubuntu
DRY_RUN=1 ./install.sh
# Executing docker install script, commit:
apt-get update -qq >/dev/null
DEBIAN_FRONTEND=noninteractive apt-get install -y -qq apt-transport-https ca-certificates curl gnupg >/dev/null
curl -fsSL "https://download.docker.com/linux/ubuntu/gpg " | gpg --dearmor --yes -o /usr/share/keyrings/docker-archive-keyring.gpg
chmod a+r /usr/share/keyrings/docker-archive-keyring.gpg
echo "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu focal stable" > /etc/apt/sources.list.d/docker.list
apt-get update -qq >/dev/null
DEBIAN_FRONTEND=noninteractive apt-get install -y -qq --no-install-recommends docker-ce-cli docker-scan-plugin docker-ce >/dev/null
DEBIAN_FRONTEND=noninteractive apt-get install -y -qq docker-ce-rootless-extras >/dev/null
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2022-04-25 18:25:58 +02:00
Sebastiaan van Stijn
0225270d2d
Merge pull request #277 from thaJeztah/rootless_linting
...
rootless-install.sh: fix some shellcheck warnings
2022-03-25 00:31:09 +01:00
Sebastiaan van Stijn
47b693cf80
rootless-install.sh: fix some shellcheck warnings
...
Fixes some shellcheck linting warnings:
- [SC2034][SC2034]: "SCRIPT_COMMIT_SHA appears unused. Verify use (or export if used externally)."
- [SC2046][SC2046]: "Quote this to prevent word splitting"
- [SC2002][SC2002]: "Useless cat. Consider cmd < file | .. or cmd file | .. instead"
- [SC2064][SC2064]: "Use single quotes, otherwise this expands now rather than when signalled."
[SC2034]: https://github.com/koalaman/shellcheck/wiki/SC2034
[SC2002]: https://github.com/koalaman/shellcheck/wiki/SC2002
[SC2046]: https://github.com/koalaman/shellcheck/wiki/SC2046
[SC2064]: https://github.com/koalaman/shellcheck/wiki/SC2064
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2022-03-24 05:00:03 +01:00
Sebastiaan van Stijn
9809a3daab
Merge pull request #279 from thaJeztah/bump_rootless_20.10.14
...
rootless-install.sh: update to 20.10.14
2022-03-24 04:35:33 +01:00
Sebastiaan van Stijn
7957df7e58
rootless-install.sh: update to 20.10.14
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2022-03-24 04:14:56 +01:00
Sebastiaan van Stijn
07b4d2541e
Merge pull request #275 from thaJeztah/update_rootless
...
rootless-install.sh: update to 20.10.13
2022-03-21 16:10:13 +01:00
Sebastiaan van Stijn
47f7993357
Merge pull request #276 from thaJeztah/fix_keyring_permissions
...
install.sh: set read-permissions for environments with non-standard umask
2022-03-21 16:09:51 +01:00
e5f4d99c75
install.sh: set read-permissions for environments with non-standard umask
...
Some environments may have a non-standard (non 022) umask set, in which case
the keyring would not get read-permissions for all users, which lead to errors
during install:
W: GPG error: The following signatures couldn't be verified because the public key is not available: NO_PUBKEY 7EA0A9C3F273FCD8
This commit changes the permissions of the file, so that it's world-readable.
See https://stackoverflow.com/a/68764068
Co-Authored-By: ManhIT <manhit@s-developers.com >
Co-Authored-By: Hervé M <hmag@users.noreply.github.com >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2022-03-21 15:56:26 +01:00
Sebastiaan van Stijn
115a7774b5
rootless-install.sh: update to 20.10.13
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2022-03-21 15:26:32 +01:00
Sebastiaan van Stijn
c6e44282af
Merge pull request #268 from AkihiroSuda/rootless-20.10.12
...
rootless-install.sh: update to 20.10.12
2021-12-22 16:00:24 +01:00
Akihiro Suda
f72a74dc3c
rootless-install.sh: update to 20.10.12
...
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp >
2021-12-15 18:48:37 +09:00
Sebastiaan van Stijn
fa5e8eaa2b
Merge pull request #252 from danifr/patch-1
...
Fix typo in README
2021-12-09 10:41:37 +01:00
Sebastiaan van Stijn
8095e19330
Merge pull request #263 from thaJeztah/update_rootless
...
rootless-install.sh: update to docker 20.10.11
2021-11-18 10:12:03 +01:00
Sebastiaan van Stijn
e3dbca92e6
rootless-install.sh: update to docker 20.10.11
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2021-11-18 02:08:36 +01:00
Stefan Scherer
85d7766b76
Merge pull request #259 from thaJeztah/update_rootless
...
rootless-install.sh: update to docker 20.10.10
2021-10-25 18:21:51 +02:00
Sebastiaan van Stijn
e363bcee49
rootless-install.sh: update to docker 20.10.10
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2021-10-25 17:10:42 +02:00
Sebastiaan van Stijn
f329e17e52
Merge pull request #257 from AkihiroSuda/rootless-20.10.9
...
rootless-install.sh: update to 20.10.9
2021-10-05 08:38:02 +02:00
Akihiro Suda
339bbd1dee
rootless-install.sh: update to 20.10.9
...
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp >
2021-10-05 14:38:41 +09:00
Daniel Fernández
bb33a7c7da
Fix typo in README
...
This commit https://github.com/docker/docker-install/commit/51a9fbfd1dae4097d9666a72b566dba68d1d4bc7 changed the default channel from 'test' to 'stable'
Signed-off-by: Daniel Fernández <daferoes@gmail.com >
2021-09-26 18:04:06 +02:00
Sebastiaan van Stijn
93d2499759
Merge pull request #250 from linux-on-ibm-z/s390x-sles-changes
...
Added a generic fix for enabling SLES repos
2021-08-20 09:42:47 +02:00
anujajakhade
09607b8fc4
Added a generic fix for enabling SLES repos
...
Signed-off-by: Anuja Jakhade <anujajakhade@gmail.com >
2021-08-20 04:19:45 +00:00
Sebastiaan van Stijn
2c9e027241
Merge pull request #251 from meabed/patch-1
...
Fix non-interactive installation
2021-08-20 00:49:10 +02:00
Mohamed Meabed
a49ecdef76
Fix non-interactive installation
...
gpg prompt for overwriting the keyring file - adding `--yes` will fix it
```
You may press Ctrl+C now to abort this script.
+ sleep 20
+ sh -c apt-get update -qq >/dev/null
+ sh -c DEBIAN_FRONTEND=noninteractive apt-get install -y -qq apt-transport-https ca-certificates curl >/dev/null
+ sh -c curl -fsSL "https://download.docker.com/linux/debian/gpg " | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
File '/usr/share/keyrings/docker-archive-keyring.gpg' exists. Overwrite? (y/N)
```
Signed-off-by: Mohamed Meabed <mo.meabed@gmail.com >
2021-08-19 18:01:30 -04:00
Sebastiaan van Stijn
0e685c6ac0
Merge pull request #248 from thaJeztah/carry_239_s390x_script
...
Added support for sles (s390x) in installation script (carry 239)
2021-08-09 10:09:40 +02:00
anujajakhade
63fb2060c9
Added support for sles (s390x) in installation script
...
Signed-off-by: Anuja Jakhade <anujajakhade@gmail.com >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2021-08-09 10:03:48 +02:00
Sebastiaan van Stijn
f7e485202d
Merge pull request #246 from thaJeztah/update_rootless_extras
...
rootless-install.sh: update to 20.10.8
2021-08-04 02:32:25 +02:00
Sebastiaan van Stijn
3749cb7b46
rootless-install.sh: update to 20.10.8
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2021-08-04 02:15:34 +02:00
Sebastiaan van Stijn
28bc4d09b3
Merge pull request #243 from thaJeztah/carry_241_add_bullseye
...
Add support for debian bullseye and deprecate apt-key (carry 241)
2021-07-31 00:13:10 +02:00
YadominJinta and Sebastiaan van Stijn
265aebf0c0
apt-key is deprecated
...
Co-authored-by: Sebastiaan van Stijn <github@gone.nl >
Signed-off-by: YadominJinta <i@yadom.in >
2021-07-31 00:07:40 +02:00
YadominJinta
b7f48ab89e
add debian bullseye support
...
Signed-off-by: YadominJinta <i@yadom.in >
2021-07-18 01:51:10 +08:00
Sebastiaan van Stijn
ef254df8c2
Merge pull request #232 from thaJeztah/remove_jessie_stretch
...
remove code for Debian Jessie and "Kali Linux"
2021-07-06 08:47:59 +02:00
Sebastiaan van Stijn
5e579a63d7
remove "add_debian_backport_repo()", as it's no longer in use
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2021-07-05 20:37:49 +02:00
Sebastiaan van Stijn
3beefb7275
remove code for Debian Jessie and "Kali Linux"
...
Jessie reached EOL quite some time ago, and we do not support
Debian/Ubuntu derrivatives, so removing code for Kali Linux.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2021-07-05 20:09:52 +02:00
Sebastiaan van Stijn
e93e55402e
Merge pull request #238 from thaJeztah/xenial_eol
...
Add deprecation warning for Ubuntu Xenial (16.05) and other EOL distro versions
2021-07-05 19:12:38 +02:00
Sebastiaan van Stijn
c1f1c9c6ae
Add deprecation warning for Ubuntu Xenial (16.05) and other EOL distro versions
...
This adds a deprecation warning for distro versions that reached EOL, and for
which we no longer maintain updates.
Note that the list of versions for which we produce warnings is not "complete",
and only contains versions that either reached EOL recently, or LTS versions
that may still be commonly in use.
With this patch;
Running inside a fedora:32 container:
DEPRECATION WARNING
This Linux distribution (fedora 32) reached end-of-life and is no longer supported by this script.
No updates or security fixes will be released for this distribution, and users are recommended
to upgrade to a currently maintained version of fedora.
Press Ctrl+C now to abort this script, or wait for the installation to continue.
^C
Running inside an ubuntu:xenial container:
DEPRECATION WARNING
This Linux distribution (ubuntu xenial) reached end-of-life and is no longer supported by this script.
No updates or security fixes will be released for this distribution, and users are recommended
to upgrade to a currently maintained version of ubuntu.
Press Ctrl+C now to abort this script, or wait for the installation to continue.
^C
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2021-07-04 13:17:19 +02:00
Sebastiaan van Stijn
1a7e2fbac8
Merge pull request #235 from thaJeztah/install_recommends
...
deb: explicitly install docker-ce-cli, scan-plugin, and docker-ce
2021-06-07 15:30:27 +02:00
Sebastiaan van Stijn
92cec076fa
deb: explicitly install docker-ce-cli, scan-plugin, and docker-ce
...
The scripts is using "--no-install-recommends" to provide a more
minimal install, and to prevent installing "latest" version of
(e.g.) the engine when installing the CLI.
This patch:
- adds some utilities to compare versions
- skips CLI-version discovery on older versions (before 18.09)
which did not have separate packages for the CLI
- on versions 20.10 and up (or if no version was specified), also
install the scan cli plugin (support for cli plugins was added
in docker 19.03, but not installing on that version by default))
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2021-06-03 18:23:55 +02:00
Sebastiaan van Stijn
62d63f6870
Merge pull request #236 from thaJeztah/remove_migrate_message
...
remove warning about pre-1.10 update
2021-06-03 18:14:20 +02:00
Sebastiaan van Stijn
666023805e
remove warning about pre-1.10 update
...
When upgrading docker from versions older than v1.10, the image
store must be migrated for the content-addressable store.
Docker 1.10 was released more than 5 years ago, so people running
versions older than that, probably have more urgent things to
be concerned about, so removing this warning.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2021-06-03 16:33:57 +02:00
Sebastiaan van Stijn
4309d55aa0
Merge pull request #234 from AkihiroSuda/whichless
...
rootless-install.sh: use command -v instead of which
2021-06-03 12:35:30 +02:00
Akihiro Suda
14cc52aa0d
rootless-install.sh: use command -v instead of which
...
The which command is often missing.
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp >
2021-06-03 15:19:04 +09:00
Sebastiaan van Stijn
fa54c48917
Merge pull request #233 from thaJeztah/update_rootless_install
...
rootless-install.sh: update to 20.10.7
2021-06-02 23:22:03 +02:00