Commit Graph
298 Commits
Author SHA1 Message Date
Akihiro Suda 42ea9b5816 rootless (nightly): set PATH="$BIN:$PATH" before running setup tool
Previously, it was failing with the following error when $BIN is not
present in $PATH:

  + /home/vagrant/bin/dockerd-rootless-setuptool.sh install
  [ERROR] dockerd-rootless.sh needs to be present under $PATH

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-09-10 20:46:40 +09:00
Stefan Scherer 2639a23348 Merge pull request #181 from AkihiroSuda/rootless-install-nightly
rootless: call dockerd-rootless-setuptool.sh for $CHANNEL=nightly
2020-07-29 15:58:00 +02:00
Akihiro Suda 648b037d33 rootless: call dockerd-rootless-setuptool.sh for $CHANNEL=nightly
`dockerd-rootless-setuptool.sh` is the new standard way to set up the systemd unit file.
https://github.com/moby/moby/blob/master/contrib/dockerd-rootless-setuptool.sh

The usage of `rootless-install.sh` stays same.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-07-09 12:06:42 +09:00
Stefan Scherer 2e839c9ac3 Merge pull request #180 from AkihiroSuda/rootless-19.03.12
rootless-install.sh: bump up to 19.03.12
2020-06-30 19:10:30 +02:00
Akihiro Suda 71e416d33b rootless-install.sh: bump up to 19.03.12
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-06-26 14:29:52 +09:00
Sebastiaan van Stijn ca9ffdfa16 Merge pull request #178 from AkihiroSuda/rootless-safe-fallback
rootless-install.sh: use safer XRD on non-systemd hosts
2020-06-22 11:48:23 +02:00
Akihiro Suda ebbfa9e2c9 rootless-install.sh: use safer XRD on non-systemd hosts
`/tmp/docker-$(id -u)` is not a good candidate as `$XDG_RUNTIME_DIR`,
because it might be already created by another user.

The new path is `$HOME/.docker/run`.

This commit does not affect systemd-based hosts.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-06-17 12:11:26 +09:00
Stefan Scherer 3d1b8a87b3 Merge pull request #176 from AkihiroSuda/rootless-19.03.11
rootless-install.sh: bump up to 19.03.11
2020-06-02 08:26:58 +02:00
Akihiro Suda 9b848b90d5 rootless-install.sh: bump up to 19.03.11
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-06-02 12:28:13 +09:00
Stefan Scherer a65b2ef5cc Merge pull request #175 from AkihiroSuda/rootless-19.03.10
rootless-install.sh: bump up to 19.03.10
2020-06-01 11:43:50 +02:00
Akihiro Suda 8bebc47718 rootless-install.sh: bump up to 19.03.10
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-05-31 18:35:10 +09:00
Stefan Scherer 0016726309 Merge pull request #174 from AkihiroSuda/rootless-19.03.9
rootless-install.sh: bump up to 19.03.9
2020-05-21 16:16:07 +02:00
Akihiro Suda 5d4953fa6d rootless-install.sh: bump up to 19.03.9
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-05-20 07:53:54 +09:00
Sebastiaan van Stijn 26ff363bcf Merge pull request #172 from StefanScherer/cleanup_dists
Cleanup unsupported dists
2020-05-14 14:45:04 +02:00
Stefan Scherer d09f5ddf06 Cleanup unsupported dists
Signed-off-by: Stefan Scherer <stefan.scherer@docker.com>
2020-05-14 14:36:39 +02:00
Stefan Scherer 6c853fbdb5 Merge pull request #171 from tiborvass/rhel
Make script work on RHEL
2020-05-14 14:35:23 +02:00
Tibor Vass ff2a04b1d0 Make script work on RHEL
Signed-off-by: Tibor Vass <tibor@docker.com>
2020-05-14 09:13:13 +00:00
Sebastiaan van Stijn 1b02882d63 Merge pull request #170 from StefanScherer/check-docker-desktop
[DESKTOP-2757] Check for macOS and WSL and suggest Docker Desktop
2020-05-04 17:07:07 +02:00
Stefan Scherer eb9f7d5535 Check for macOS and WSL
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
2020-05-01 18:30:32 +02:00
Stefan Scherer b50fac9805 Merge pull request #164 from AkihiroSuda/rootless-19.03.8
rootless-install.sh: bump up to 19.03.8
2020-03-13 07:26:42 +01:00
Sebastiaan van Stijn 839088df28 Merge pull request #139 from mike2307/fix_systemd_target
Changed systemd target of rootless docker to default
2020-03-12 13:29:07 +01:00
Akihiro Suda b0bfd01195 rootless-install.sh: bump up to 19.03.8
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-03-12 10:11:05 +09:00
Tibor Vass 442e66405c Merge pull request #157 from AkihiroSuda/rootless-19.03.7
rootless-install.sh: bump up to 19.03.7
2020-03-06 06:25:11 -08:00
Akihiro Suda 8f06acc16a rootless-install.sh: bump up to 19.03.7
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-03-06 23:18:55 +09:00
Sebastiaan van Stijn 6a3f6123e8 Merge pull request #158 from AkihiroSuda/header-docs
add URLs of docs to headers
2020-03-06 15:15:57 +01:00
Sebastiaan van Stijn 04b009c997 Merge pull request #160 from thaJeztah/actions_updates
Update GitHub Actions configuration
2020-03-06 14:53:35 +01:00
Sebastiaan van Stijn 86b5216299 GH Actions: remove 18.09 as it reached EOL
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-06 12:59:31 +01:00
Sebastiaan van Stijn 8bc30fbe67 GH Actions: set 5 minute timeout for the tests
GitHub Actions have a default timeout of 6 hours, which is
waaaay to high.

This updates the timeout to 5 minutes (they currently run in
just over a minutes, so for now this should be enough).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-06 12:56:37 +01:00
Sebastiaan van Stijn 6cb8e3cf58 Merge pull request #155 from StefanScherer/gh-actions
Switch to GitHub actions
2020-03-06 12:12:26 +01:00
Akihiro Suda 3c111ffdb2 add URLs of docs to headers
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-03-06 03:36:30 +09:00
Stefan Scherer 3674c8a129 Merge pull request #153 from AkihiroSuda/rootless-19.03.6
rootless-install.sh: bump up to 19.03.6
2020-02-13 08:27:00 +01:00
Stefan Scherer 3d4dc552d6 Add GitHub actions
Signed-off-by: Stefan Scherer <stefan.scherer@docker.com>
2020-02-13 08:10:56 +01:00
Akihiro Suda 89230e7b51 rootless-install.sh: bump up to 19.03.6
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-02-13 14:53:46 +09:00
Zuhayr Elahi ecfa0264ab Merge pull request #149 from AkihiroSuda/rootless-19.03.5
rootless-install.sh: bump up to 19.03.5
2019-12-05 10:12:24 -08:00
Akihiro Suda 2ef20de64a rootless-install.sh: bump up to 19.03.5
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2019-11-15 19:28:21 +09:00
Zuhayr Elahi 7eceb48d98 Merge pull request #146 from AkihiroSuda/support-channel
rootless: support channels (stable/nightly)
2019-11-05 09:33:30 -08:00
Akihiro Suda ad81e227de rootless: support channels (stable/nightly)
The default channel is set to "stable".

The latest stable version is currently hardcoded in the script.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2019-10-24 17:02:39 +09:00
mscheiff e34b06a167 Changed systemd target of rootless docker to default
Signed-off-by: Michael Scheiffler <michael@scheiffler.at>
2019-09-30 21:28:46 +02:00
Eli Uriegas f45d7c1138 Merge pull request #138 from GLTLAB/master
Fix pending issue by interactive installation
2019-09-21 12:54:43 -07:00
Omega Lightning 3c42c7877f Fixed pending issue by interactive installation
An interactive step is needed by libssl1.1:amd64 to config itself. User must chose Yes/No about "Restart services during package upgrades without asking?" via frontend. "DEBIAN_FRONTEND=noninteractive" will make default options be chosen and no interruption in the process.

Signed-off-by: lightning-zgc <lightning@gltlab.cn>
2019-09-22 03:09:41 +08:00
Eli Uriegas 6bf300318e Merge pull request #132 from seemethere/fix_enbsubst
[TAR-917] ci: Update addprefix to add another `$`
2019-07-15 10:29:49 -10:00
Eli Uriegas 13623a6a08 Change enbsubst to substitute for new COMMIT_SHA var
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2019-07-15 20:27:13 +00:00
Eli Uriegas 67086425e1 ci: Update addprefix to add another $
the envsubst wasn't working correctly on ubuntu due to the `$` getting
stripped by make during the `addprefix`

Should now work correctly no matter what distribution you're on

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2019-07-15 20:17:39 +00:00
Eli Uriegas 5ccc69f937 Merge pull request #131 from seemethere/simplify_ci
[TAR-916] Simplify CI, it was too complicated
2019-07-15 09:14:58 -10:00
Eli Uriegas dde1dc2b87 Simplify CI, it was too complicated
Simplifies CI to run through a simple `make test` target that has an
underlying `TEST_IMAGE` variable which determines the distribution to
run on.

Also changes the Jenkinsfile to be declarative since the old one kind of
sucked.

Also adds a test for version pinning since that's something we rely on a
lot.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2019-07-15 19:09:20 +00:00
Zuhayr Elahi d97f8ab916 Merge pull request #119 from zelahi/docker-rootless-bin-folder
Docker rootless bin folder
2019-07-02 16:41:46 -07:00
Eli Uriegas 8f03fee98c Add support for Debian Buster (#126)
Add support for Debian Buster
2019-07-01 06:00:47 -10:00
MichaIng 641cbb9228 Add Buster support for non-forked Debian as well
Signed-off-by: Micha Felle <micha@dietpi.com>
2019-07-01 17:25:41 +02:00
MichaIng ce6255dc7d Add support for Debian Buster
Signed-off-by: Micha Felle <micha@dietpi.com>
2019-06-15 03:19:33 +02:00
zelahi c5cd433108 ADDED configurable BIN folder
FIXED systemd unit file to take in user provided path

Signed-off-by: zelahi <elahi.zuhayr@gmail.com>
2019-05-22 17:11:44 -07:00