diff --git a/README.md b/README.md index 345f0af..26cefd2 100644 --- a/README.md +++ b/README.md @@ -112,19 +112,19 @@ A `kind: set` merges the two into one published kit. Publish both kits to a regi schemaVersion: "3" kind: set displayName: Hello Labspace (ready to run) -version: "0.1.5" +version: "0.1.6" kits: - - ref: docker.io//labspace:0.1.5 - - ref: docker.io//hello-lab:0.1.5 + - ref: docker.io//labspace:0.1.6 + - ref: docker.io//hello-lab:0.1.6 ``` ```bash -docker buildx build --builder kit-builder kit -f kit/labspace.yaml -t docker.io//labspace:0.1.5 --push -docker buildx build --builder kit-builder examples/hello-lab -f examples/hello-lab/hello-lab.yaml -t docker.io//hello-lab:0.1.5 --push -docker buildx build --builder kit-builder . -f hello-lab-set.yaml -t docker.io//hello-lab-set:0.1.5 --push +docker buildx build --builder kit-builder kit -f kit/labspace.yaml -t docker.io//labspace:0.1.6 --push +docker buildx build --builder kit-builder examples/hello-lab -f examples/hello-lab/hello-lab.yaml -t docker.io//hello-lab:0.1.6 --push +docker buildx build --builder kit-builder . -f hello-lab-set.yaml -t docker.io//hello-lab-set:0.1.6 --push # learners: -sbx run shell --kit docker.io//hello-lab-set:0.1.5 -p 8085:8085 -p 3000:3000 --name hello-lab +sbx run shell --kit docker.io//hello-lab-set:0.1.6 -p 8085:8085 -p 3000:3000 --name hello-lab ``` `kit-builder` is a `docker-container` builder (`docker buildx create --name kit-builder --driver docker-container --bootstrap`), as in the [spec README](https://github.com/docker/sandbox-kit-spec#building-a-kit). @@ -152,19 +152,19 @@ Then start one of the labs from that folder. The built-in getting-started lab (Labspace kit only): ```bash -sbx run shell --kit ghcr.io/mathieu-benoit/labsbxes/labspace:0.1.5 -p 8085:8085 --name labspace +sbx run shell --kit ghcr.io/mathieu-benoit/labsbxes/labspace:0.1.6 -p 8085:8085 --name labspace ``` `hello-lab` (pin 3000 for its tab link): ```bash -sbx run shell --kit ghcr.io/mathieu-benoit/labsbxes/labspace:0.1.5 --kit ghcr.io/mathieu-benoit/labsbxes/hello-lab:0.1.5 -p 8085:8085 -p 3000:3000 --name hello-lab +sbx run shell --kit ghcr.io/mathieu-benoit/labsbxes/labspace:0.1.6 --kit ghcr.io/mathieu-benoit/labsbxes/hello-lab:0.1.6 -p 8085:8085 -p 3000:3000 --name hello-lab ``` `building-images-lab` (pin 5050 for its Quote App tab): ```bash -sbx run shell --kit ghcr.io/mathieu-benoit/labsbxes/labspace:0.1.5 --kit ghcr.io/mathieu-benoit/labsbxes/building-images-lab:0.1.5 -p 8085:8085 -p 5050:5050 --name building-images-lab +sbx run shell --kit ghcr.io/mathieu-benoit/labsbxes/labspace:0.1.6 --kit ghcr.io/mathieu-benoit/labsbxes/building-images-lab:0.1.6 -p 8085:8085 -p 5050:5050 --name building-images-lab ``` Then open the host port `sbx ports ` lists for sandbox port 3030 (for example `sbx ports hello-lab`). That host port is picked by `sbx` and changes at every start; add `-p 3030:3030` to any of these commands to open the interface at http://localhost:3030 instead. diff --git a/examples/building-images-lab/README.md b/examples/building-images-lab/README.md index 9981e71..3506e5d 100644 --- a/examples/building-images-lab/README.md +++ b/examples/building-images-lab/README.md @@ -21,7 +21,7 @@ mkdir -p ~/sbx-lab && cd ~/sbx-lab ``` ```bash -sbx run shell --kit ghcr.io/mathieu-benoit/labsbxes/labspace:0.1.5 --kit ghcr.io/mathieu-benoit/labsbxes/building-images-lab:0.1.5 -p 8085:8085 -p 5050:5050 --name building-images-lab +sbx run shell --kit ghcr.io/mathieu-benoit/labsbxes/labspace:0.1.6 --kit ghcr.io/mathieu-benoit/labsbxes/building-images-lab:0.1.6 -p 8085:8085 -p 5050:5050 --name building-images-lab ``` Then run `sbx ports building-images-lab` and open `http://127.0.0.1:/`, with the host port listed for sandbox port 3030. By default that host port is picked by `sbx` and changes at every start. To skip that lookup, add `-p 3030:3030` to the command: the interface is then always at http://localhost:3030 (if that host port is free). diff --git a/examples/building-images-lab/building-images-lab.yaml b/examples/building-images-lab/building-images-lab.yaml index 071c4d3..5978afa 100644 --- a/examples/building-images-lab/building-images-lab.yaml +++ b/examples/building-images-lab/building-images-lab.yaml @@ -15,7 +15,7 @@ description: >- multi-stage builds, base images and build secrets, to be run by the Labspace kit. -version: "0.1.5" +version: "0.1.6" # Becomes the org.opencontainers.image.source annotation, which is what links # a published GHCR package to this repository. @@ -27,7 +27,7 @@ requires: ["labspace >= 0.1.0"] # One lab per sandbox: a second content kit provides the same name, and the # runtime refuses the composition. -provides: ["labspace-content@0.1.5"] +provides: ["labspace-content@0.1.6"] capabilities: # The lab runs its Quote App on port 5050 (docker run -p 5050:5050) and opens diff --git a/examples/hello-lab/README.md b/examples/hello-lab/README.md index 047e794..3d04601 100644 --- a/examples/hello-lab/README.md +++ b/examples/hello-lab/README.md @@ -21,7 +21,7 @@ mkdir -p ~/sbx-lab && cd ~/sbx-lab ``` ```bash -sbx run shell --kit ghcr.io/mathieu-benoit/labsbxes/labspace:0.1.5 --kit ghcr.io/mathieu-benoit/labsbxes/hello-lab:0.1.5 -p 8085:8085 -p 3000:3000 --name hello-lab +sbx run shell --kit ghcr.io/mathieu-benoit/labsbxes/labspace:0.1.6 --kit ghcr.io/mathieu-benoit/labsbxes/hello-lab:0.1.6 -p 8085:8085 -p 3000:3000 --name hello-lab ``` Then run `sbx ports hello-lab` and open `http://127.0.0.1:/`, with the host port listed for sandbox port 3030. By default that host port is picked by `sbx` and changes at every start. To skip that lookup, add `-p 3030:3030` to the command: the interface is then always at http://localhost:3030 (if that host port is free). diff --git a/examples/hello-lab/hello-lab.yaml b/examples/hello-lab/hello-lab.yaml index 1dff6fc..03d212c 100644 --- a/examples/hello-lab/hello-lab.yaml +++ b/examples/hello-lab/hello-lab.yaml @@ -12,7 +12,7 @@ description: >- The "Hello Labspace on Docker Sandboxes" lab: instructions and starter project, to be run by the Labspace kit. -version: "0.1.5" +version: "0.1.6" # Becomes the org.opencontainers.image.source annotation, which is what links # the published GHCR package to this repository. @@ -24,7 +24,7 @@ requires: ["labspace >= 0.1.0"] # One lab per sandbox: a second content kit provides the same name, and the # runtime refuses the composition. -provides: ["labspace-content@0.1.5"] +provides: ["labspace-content@0.1.6"] capabilities: # The lab's "Docker inside the sandbox" page runs nginx on port 3000 and diff --git a/kit/README.md b/kit/README.md index 590a415..b3cae99 100644 --- a/kit/README.md +++ b/kit/README.md @@ -27,13 +27,13 @@ mkdir -p ~/sbx-lab && cd ~/sbx-lab The built-in getting-started lab: ```bash -sbx run shell --kit ghcr.io/mathieu-benoit/labsbxes/labspace:0.1.5 -p 8085:8085 --name labspace +sbx run shell --kit ghcr.io/mathieu-benoit/labsbxes/labspace:0.1.6 -p 8085:8085 --name labspace ``` With a lab packaged as a content kit: ```bash -sbx run shell --kit ghcr.io/mathieu-benoit/labsbxes/labspace:0.1.5 --kit ghcr.io/mathieu-benoit/labsbxes/hello-lab:0.1.5 -p 8085:8085 -p 3000:3000 --name hello-lab +sbx run shell --kit ghcr.io/mathieu-benoit/labsbxes/labspace:0.1.6 --kit ghcr.io/mathieu-benoit/labsbxes/hello-lab:0.1.6 -p 8085:8085 -p 3000:3000 --name hello-lab ``` Then run `sbx ports ` and open `http://127.0.0.1:/`, with the host port listed for sandbox port 3030. By default that host port is picked by `sbx` and changes at every start. To skip that lookup, add `-p 3030:3030` to the command: the interface is then always at http://localhost:3030 (if that host port is free). diff --git a/kit/labspace.yaml b/kit/labspace.yaml index 0d901b6..9265413 100644 --- a/kit/labspace.yaml +++ b/kit/labspace.yaml @@ -9,7 +9,7 @@ description: >- Docker engine. Point it at a content folder that has a labspace/ and a project/ directory. Replaces the labspace-infra Compose stack. -version: "0.1.5" +version: "0.1.6" # Becomes the org.opencontainers.image.source annotation, which is what links # the published GHCR package to this repository. @@ -19,7 +19,7 @@ sourceUrl: https://github.com/mathieu-benoit/labsbxes # Docker engine, bash and the `agent` user). Nothing is required by name: the # engine is asked for through dockerd@1 below. provides: - - "labspace@0.1.5" + - "labspace@0.1.6" - "code-server@${{ kit.args.codeServerVersion }}" args: