Skip to content

Commit

Permalink
debug
Browse files Browse the repository at this point in the history
Signed-off-by: Paweł Gronowski <[email protected]>
  • Loading branch information
vvoland committed Oct 16, 2024
1 parent 2267b9f commit 28aa658
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 4 deletions.
3 changes: 2 additions & 1 deletion __tests__/docker/install.test.itg.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,9 @@ aarch64:https://cloud.debian.org/images/cloud/bookworm/20231013-1532/debian-12-g
process.env = originalEnv;
});
// prettier-ignore
test.each([
test.concurrent.each([
{type: 'image', tag: '27.3.1'} as InstallSourceImage,
{type: 'image', tag: 'master'} as InstallSourceImage,
{type: 'archive', version: 'v26.1.4', channel: 'stable'} as InstallSourceArchive,
])(
'install docker %s', async (source) => {
Expand Down
18 changes: 15 additions & 3 deletions src/docker/assets.ts
Original file line number Diff line number Diff line change
Expand Up @@ -229,11 +229,23 @@ provision:
wget https://raw.githubusercontent.com/moby/moby/{{srcImageTag}}/contrib/init/systemd/docker.service \
https://raw.githubusercontent.com/moby/moby/v{{srcImageTag}}/contrib/init/systemd/docker.service \
-O /etc/systemd/system/docker.service || true
sed -i 's|^ExecStart=.*|ExecStart=/tool/dockerd|' /etc/systemd/system/docker.service
wget https://raw.githubusercontent.com/moby/moby/{{srcImageTag}}/contrib/init/systemd/docker.socket \
https://raw.githubusercontent.com/moby/moby/v{{srcImageTag}}/contrib/init/systemd/docker.socket \
-O /etc/systemd/system/docker.socket || true
mkdir -p /usr/local/bin
cp /tool/* /usr/local/bin/
sed -i 's|^ExecStart=.*|ExecStart=/usr/local/bin/dockerd -H fd://|' /etc/systemd/system/docker.service
sed -i 's|containerd.service||' /etc/systemd/system/docker.service
sed -i 's|docker.socket||' /etc/systemd/system/docker.service
sed -i 's|=/run/docker.sock|=/var/run/docker.sock|' /etc/systemd/system/docker.socket
if ! getent group docker; then
groupadd --system docker
fi
systemctl daemon-reload
systemctl enable --now docker
if ! systemctl enable --now docker; then
systemctl status docker.socket
systemctl status docker.service
fi
fi
probes:
Expand Down

0 comments on commit 28aa658

Please sign in to comment.