diff --git a/__tests__/docker/install.test.itg.ts b/__tests__/docker/install.test.itg.ts index b4a24263..bd43647e 100644 --- a/__tests__/docker/install.test.itg.ts +++ b/__tests__/docker/install.test.itg.ts @@ -14,8 +14,9 @@ * limitations under the License. */ -import path from 'path'; import {jest, describe, expect, test, beforeEach, afterEach} from '@jest/globals'; +import path from 'path'; +import * as core from '@actions/core'; import {Install} from '../../src/docker/install'; import {Docker} from '../../src/docker/docker'; @@ -46,10 +47,16 @@ describe('install', () => { contextName: 'foo', daemonConfig: `{"debug":true,"features":{"containerd-snapshotter":true}}` }); - await install.download(); + await core.group('Downloading docker', async () => { + await install.download(); + }); await install.install(); - await Docker.printVersion(); - await Docker.printInfo(); + await core.group('Docker version', async () => { + await Docker.printVersion(); + }); + await core.group('Docker info', async () => { + await Docker.printInfo(); + }); await install.tearDown(); })()).resolves.not.toThrow(); }, 1200000); diff --git a/src/docker/assets.ts b/src/docker/assets.ts index 30fe7699..052bb118 100644 --- a/src/docker/assets.ts +++ b/src/docker/assets.ts @@ -256,7 +256,13 @@ cpuType: host provision: - mode: system script: | - wget -qO- "https://download.docker.com/linux/static/{{dockerBinChannel}}/{{dockerBinArch}}/docker-{{dockerBinVersion}}.tgz" | tar xvz --strip 1 -C /usr/bin/ + if [ -f ~/.install-docker ]; then + exit 0 + fi + if [ -f /etc/alpine-release ]; then + wget -qO- "https://download.docker.com/linux/static/{{dockerBinChannel}}/{{dockerBinArch}}/docker-{{dockerBinVersion}}.tgz" | tar xvz --strip 1 -C /usr/bin/ + fi + touch ~/.install-docker # Modify ~/.ssh/config automatically to include a SSH config for the virtual machine. # SSH config will still be generated in ~/.colima/ssh_config regardless. @@ -286,7 +292,9 @@ mounts: [] # ANOTHER_KEY: another value # # Default: {} -env: {} +env: + DOCKER_INSTALL_CHANNEL: {{dockerBinChannel}} + DOCKER_INSTALL_VERSION: {{dockerBinVersion}} `; export const qemuEntitlements = `