Skip to content

Commit 7117987

Browse files
crazy-maxcrazy-max
authored
Merge pull request #119 from crazy-max/standalone
Standalone mode
2 parents 74283ca + 17ebdd4 commit 7117987

File tree

10 files changed

+320
-89
lines changed

10 files changed

+320
-89
lines changed

‎.github/workflows/ci.yml

+97-43
Original file line numberDiff line numberDiff line change
@@ -30,21 +30,9 @@ jobs:
3030
uses: actions/checkout@v3
3131
-
3232
name: Set up Docker Buildx
33-
id: buildx
3433
uses: ./
3534
with:
3635
version: ${{ matrix.buildx-version }}
37-
-
38-
name: Inspect builder
39-
run: |
40-
echo "Name: ${{ steps.buildx.outputs.name }}"
41-
echo "Endpoint: ${{ steps.buildx.outputs.endpoint }}"
42-
echo "Status: ${{ steps.buildx.outputs.status }}"
43-
echo "Flags: ${{ steps.buildx.outputs.flags }}"
44-
echo "Platforms: ${{ steps.buildx.outputs.platforms }}"
45-
-
46-
name: Dump context
47-
uses: crazy-max/ghaction-dump-context@v1
4836

4937
multi:
5038
runs-on: ubuntu-latest
@@ -54,28 +42,10 @@ jobs:
5442
uses: actions/checkout@v3
5543
-
5644
name: Set up Docker Buildx 1
57-
id: buildx1
5845
uses: ./
59-
-
60-
name: Inspect builder 1
61-
run: |
62-
echo "Name: ${{ steps.buildx1.outputs.name }}"
63-
echo "Endpoint: ${{ steps.buildx1.outputs.endpoint }}"
64-
echo "Status: ${{ steps.buildx1.outputs.status }}"
65-
echo "Flags: ${{ steps.buildx1.outputs.flags }}"
66-
echo "Platforms: ${{ steps.buildx1.outputs.platforms }}"
6746
-
6847
name: Set up Docker Buildx 2
69-
id: buildx2
7048
uses: ./
71-
-
72-
name: Inspect builder 2
73-
run: |
74-
echo "Name: ${{ steps.buildx2.outputs.name }}"
75-
echo "Endpoint: ${{ steps.buildx2.outputs.endpoint }}"
76-
echo "Status: ${{ steps.buildx2.outputs.status }}"
77-
echo "Flags: ${{ steps.buildx2.outputs.flags }}"
78-
echo "Platforms: ${{ steps.buildx2.outputs.platforms }}"
7949

8050
error:
8151
runs-on: ubuntu-latest
@@ -328,18 +298,9 @@ jobs:
328298
platforms: ${{ matrix.qemu-platforms }}
329299
-
330300
name: Set up Docker Buildx
331-
id: buildx
332301
uses: ./
333302
with:
334303
version: ${{ matrix.buildx-version }}
335-
-
336-
name: Inspect builder
337-
run: |
338-
echo "Name: ${{ steps.buildx.outputs.name }}"
339-
echo "Endpoint: ${{ steps.buildx.outputs.endpoint }}"
340-
echo "Status: ${{ steps.buildx.outputs.status }}"
341-
echo "Flags: ${{ steps.buildx.outputs.flags }}"
342-
echo "Platforms: ${{ steps.buildx.outputs.platforms }}"
343304

344305
build-ref:
345306
runs-on: ubuntu-latest
@@ -360,10 +321,6 @@ jobs:
360321
uses: ./
361322
with:
362323
version: https://github.com/docker/buildx.git#${{ matrix.ref }}
363-
-
364-
name: Check version
365-
run: |
366-
docker buildx version
367324
-
368325
name: Create Dockerfile
369326
run: |
@@ -375,3 +332,100 @@ jobs:
375332
uses: docker/build-push-action@master
376333
with:
377334
context: .
335+
336+
standalone:
337+
runs-on: ubuntu-latest
338+
strategy:
339+
fail-fast: false
340+
matrix:
341+
buildx-version:
342+
- latest
343+
- ""
344+
steps:
345+
-
346+
name: Checkout
347+
uses: actions/checkout@v3
348+
-
349+
name: Uninstall docker cli
350+
run: |
351+
sudo apt-get purge -y moby-cli moby-buildx
352+
-
353+
name: Set up Docker Buildx
354+
uses: ./
355+
with:
356+
version: ${{ matrix.buildx-version }}
357+
-
358+
name: Check available in path
359+
if: matrix.standalone
360+
run: |
361+
buildx version
362+
363+
standalone-install-error:
364+
runs-on: ubuntu-latest
365+
steps:
366+
-
367+
name: Checkout
368+
uses: actions/checkout@v3
369+
-
370+
name: Uninstall docker cli
371+
run: |
372+
sudo apt-get purge -y moby-cli moby-buildx
373+
-
374+
name: Set up Docker Buildx
375+
id: buildx
376+
continue-on-error: true
377+
uses: ./
378+
with:
379+
install: true
380+
-
381+
name: Check
382+
run: |
383+
echo "${{ toJson(steps.buildx) }}"
384+
if [ "${{ steps.buildx.outcome }}" != "failure" ] || [ "${{ steps.buildx.conclusion }}" != "success" ]; then
385+
echo "::error::Should have failed"
386+
exit 1
387+
fi
388+
389+
standalone-kubernetes:
390+
runs-on: ubuntu-latest
391+
steps:
392+
-
393+
name: Checkout
394+
uses: actions/checkout@v3
395+
-
396+
name: Uninstall moby
397+
run: |
398+
sudo apt-get purge -y moby-engine moby-cli moby-buildx
399+
-
400+
name: Setup k8s cluster
401+
run: |
402+
set -x
403+
sudo curl -fsSLo /usr/share/keyrings/kubernetes-archive-keyring.gpg https://packages.cloud.google.com/apt/doc/apt-key.gpg
404+
echo "deb [signed-by=/usr/share/keyrings/kubernetes-archive-keyring.gpg] https://apt.kubernetes.io/ kubernetes-xenial main" | sudo tee /etc/apt/sources.list.d/kubernetes.list
405+
sudo apt-get update
406+
sudo apt-get install -y kubelet kubeadm kubectl
407+
sudo swapoff -a
408+
sudo kubeadm init --cri-socket /run/containerd/containerd.sock
409+
mkdir -p $HOME/.kube/
410+
sudo cp -i /etc/kubernetes/admin.conf $HOME/.kube/config
411+
sudo chown $USER $HOME/.kube/config
412+
kubectl taint nodes --all node-role.kubernetes.io/master-
413+
kubectl apply -f https://docs.projectcalico.org/manifests/calico.yaml
414+
kubectl wait --for=condition=ready --timeout=30s node --all
415+
kubectl get nodes -o wide
416+
-
417+
name: Create Dockerfile
418+
run: |
419+
cat > ./Dockerfile <<EOL
420+
FROM alpine
421+
RUN echo hello
422+
EOL
423+
-
424+
name: Set up Docker Buildx
425+
uses: ./
426+
with:
427+
driver: kubernetes
428+
-
429+
name: Build
430+
run: |
431+
buildx build .

‎README.md

+31-3
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ ___
2424
* [BuildKit daemon configuration](#buildkit-daemon-configuration)
2525
* [Registry mirror](#registry-mirror)
2626
* [Max parallelism](#max-parallelism)
27+
* [Standalone mode](#standalone-mode)
2728
* [Customizing](#customizing)
2829
* [inputs](#inputs)
2930
* [outputs](#outputs)
@@ -180,6 +181,33 @@ jobs:
180181
config: .github/buildkitd.toml
181182
```
182183

184+
### Standalone mode
185+
186+
If you don't have the Docker CLI installed on the GitHub Runner, buildx binary
187+
is invoked directly, instead of calling it as a docker plugin. This can be
188+
useful if you want to use the `kubernetes` driver in your self-hosted runner:
189+
190+
```yaml
191+
name: ci
192+
193+
on:
194+
push:
195+
196+
jobs:
197+
buildx:
198+
runs-on: ubuntu-latest
199+
steps:
200+
-
201+
name: Set up Docker Buildx
202+
uses: docker/setup-buildx-action@v1
203+
with:
204+
driver: kubernetes
205+
-
206+
name: Build
207+
run: |
208+
buildx build .
209+
```
210+
183211
## Customizing
184212

185213
### inputs
@@ -195,10 +223,10 @@ Following inputs can be used as `step.with` keys
195223
| `install` | Bool | Sets up `docker build` command as an alias to `docker buildx` (default `false`) |
196224
| `use` | Bool | Switch to this builder instance (default `true`) |
197225
| `endpoint` | String | [Optional address for docker socket](https://github.com/docker/buildx/blob/master/docs/reference/buildx_create.md#description) or context from `docker context ls` |
198-
| `config` | String | [BuildKit config file](https://github.com/docker/buildx/blob/master/docs/reference/buildx_create.md#config) |
199-
| `config-inline` | String | Same as `config` but inline |
226+
| `config`¹ | String | [BuildKit config file](https://github.com/docker/buildx/blob/master/docs/reference/buildx_create.md#config) |
227+
| `config-inline`¹ | String | Same as `config` but inline |
200228

201-
> `config` and `config-inline` are mutually exclusive.
229+
> * ¹ `config` and `config-inline` are mutually exclusive
202230

203231
> `CSV` type must be a newline-delimited string
204232
> ```yaml

‎__tests__/buildx.test.ts

+26-12
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,17 @@ describe('isAvailable', () => {
3232
});
3333
});
3434

35+
describe('isAvailable standalone', () => {
36+
const execSpy = jest.spyOn(exec, 'getExecOutput');
37+
buildx.isAvailable(true);
38+
39+
// eslint-disable-next-line jest/no-standalone-expect
40+
expect(execSpy).toHaveBeenCalledWith(`buildx`, [], {
41+
silent: true,
42+
ignoreReturnCode: true
43+
});
44+
});
45+
3546
describe('getVersion', () => {
3647
it('valid', async () => {
3748
const version = await buildx.getVersion();
@@ -75,29 +86,32 @@ describe('build', () => {
7586

7687
// eslint-disable-next-line jest/no-disabled-tests
7788
it.skip('builds refs/pull/648/head', async () => {
78-
const buildxBin = await buildx.build('https://github.com/docker/buildx.git#refs/pull/648/head', tmpDir);
89+
const buildxBin = await buildx.build('https://github.com/docker/buildx.git#refs/pull/648/head', tmpDir, false);
7990
expect(fs.existsSync(buildxBin)).toBe(true);
8091
}, 100000);
8192

8293
// eslint-disable-next-line jest/no-disabled-tests
8394
it.skip('builds 67bd6f4dc82a9cd96f34133dab3f6f7af803bb14', async () => {
84-
const buildxBin = await buildx.build('https://github.com/docker/buildx.git#67bd6f4dc82a9cd96f34133dab3f6f7af803bb14', tmpDir);
95+
const buildxBin = await buildx.build('https://github.com/docker/buildx.git#67bd6f4dc82a9cd96f34133dab3f6f7af803bb14', tmpDir, false);
8596
expect(fs.existsSync(buildxBin)).toBe(true);
8697
}, 100000);
8798
});
8899

89100
describe('install', () => {
90101
const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'setup-buildx-'));
91-
92-
it('acquires v0.4.1 version of buildx', async () => {
93-
const buildxBin = await buildx.install('v0.4.1', tmpDir);
94-
expect(fs.existsSync(buildxBin)).toBe(true);
95-
}, 100000);
96-
97-
it('acquires latest version of buildx', async () => {
98-
const buildxBin = await buildx.install('latest', tmpDir);
99-
expect(fs.existsSync(buildxBin)).toBe(true);
100-
}, 100000);
102+
test.each([
103+
['v0.4.1', false],
104+
['latest', false],
105+
['v0.4.1', true],
106+
['latest', true]
107+
])(
108+
'acquires %p of buildx (standalone: %p)',
109+
async (version, standalone) => {
110+
const buildxBin = await buildx.install(version, tmpDir, standalone);
111+
expect(fs.existsSync(buildxBin)).toBe(true);
112+
},
113+
100000
114+
);
101115
});
102116

103117
describe('getConfig', () => {

‎__tests__/docker.test.ts

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import {describe, expect, it, jest} from '@jest/globals';
2+
import * as docker from '../src/docker';
3+
import * as exec from '@actions/exec';
4+
5+
describe('isAvailable', () => {
6+
it('cli', () => {
7+
const execSpy = jest.spyOn(exec, 'getExecOutput');
8+
docker.isAvailable();
9+
10+
// eslint-disable-next-line jest/no-standalone-expect
11+
expect(execSpy).toHaveBeenCalledWith(`docker`, undefined, {
12+
silent: true,
13+
ignoreReturnCode: true
14+
});
15+
});
16+
});

‎dist/index.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/index.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)