Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/composable-packages/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ components:
# default: false # the initial value overrides the child component
import:
# The URL to the skeleton package containing this component's package definition
url: oci://ghcr.io/zarf-dev/packages/dos-games:1.2.0
url: oci://ghcr.io/zarf-dev/packages/dos-games:1.3.0
# Example optional custom name to point to in the imported package (default is to use this component's name)
name: baseline
# Un'name'd Zarf primitives will be appended to the end of the primitive's list for that component.
Expand Down
6 changes: 3 additions & 3 deletions site/src/content/docs/commands/zarf_package_pull.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ zarf package pull PACKAGE_SOURCE [flags]
```

# Pull a package matching the current architecture
$ zarf package pull oci://ghcr.io/zarf-dev/packages/dos-games:1.2.0
$ zarf package pull oci://ghcr.io/zarf-dev/packages/dos-games:1.3.0

# Pull a package matching a specific architecture
$ zarf package pull oci://ghcr.io/zarf-dev/packages/dos-games:1.2.0 -a arm64
$ zarf package pull oci://ghcr.io/zarf-dev/packages/dos-games:1.3.0 -a arm64

# Pull a skeleton package
$ zarf package pull oci://ghcr.io/zarf-dev/packages/dos-games:1.2.0 -a skeleton
$ zarf package pull oci://ghcr.io/zarf-dev/packages/dos-games:1.3.0 -a skeleton
```

### Options
Expand Down
4 changes: 2 additions & 2 deletions site/src/content/docs/getting-started/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import { Tabs, TabItem, LinkCard, CardGrid } from '@astrojs/starlight/components
# (Select optional components as desired)

# Now you are ready to deploy any Zarf Package, try out our Retro Arcade!!
zarf package deploy oci://ghcr.io/zarf-dev/packages/dos-games:1.2.0 --key=https://zarf.dev/cosign.pub
zarf package deploy oci://ghcr.io/zarf-dev/packages/dos-games:1.3.0 --key=https://zarf.dev/cosign.pub
# (Select 'Y' to confirm deployment)
```

Expand All @@ -39,7 +39,7 @@ import { Tabs, TabItem, LinkCard, CardGrid } from '@astrojs/starlight/components
zarf init --confirm

# Deploy the DOS Games package
zarf package deploy oci://ghcr.io/zarf-dev/packages/dos-games:1.2.0 \
zarf package deploy oci://ghcr.io/zarf-dev/packages/dos-games:1.3.0 \
--key=https://zarf.dev/cosign.pub \
--confirm
```
Expand Down
2 changes: 1 addition & 1 deletion site/src/content/docs/ref/deploy.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ $ zarf connect [service name]

:::note

You can also specify a package locally, or via oci such as `zarf package deploy oci://ghcr.io/zarf-dev/packages/dos-games:1.2.0 --key=https://zarf.dev/cosign.pub`
You can also specify a package locally, or via oci such as `zarf package deploy oci://ghcr.io/zarf-dev/packages/dos-games:1.3.0 --key=https://zarf.dev/cosign.pub`

:::

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Before beginning this tutorial you will need the following:

## Deploying the Arcade

1. The `dos-games` package is easily deployable via `oci://` by running `zarf package deploy oci://ghcr.io/zarf-dev/packages/dos-games:1.2.0 --key=https://zarf.dev/cosign.pub`.
1. The `dos-games` package is easily deployable via `oci://` by running `zarf package deploy oci://ghcr.io/zarf-dev/packages/dos-games:1.3.0 --key=https://zarf.dev/cosign.pub`.

:::tip

Expand Down
6 changes: 3 additions & 3 deletions src/config/lang/english.go
Original file line number Diff line number Diff line change
Expand Up @@ -349,13 +349,13 @@ $ zarf package verify zarf-package-demo-amd64-1.0.0.tar.zst
CmdPackagePullShort = "Pulls a Zarf package from a remote registry and save to the local file system"
CmdPackagePullExample = `
# Pull a package matching the current architecture
$ zarf package pull oci://ghcr.io/zarf-dev/packages/dos-games:1.2.0
$ zarf package pull oci://ghcr.io/zarf-dev/packages/dos-games:1.3.0

# Pull a package matching a specific architecture
$ zarf package pull oci://ghcr.io/zarf-dev/packages/dos-games:1.2.0 -a arm64
$ zarf package pull oci://ghcr.io/zarf-dev/packages/dos-games:1.3.0 -a arm64

# Pull a skeleton package
$ zarf package pull oci://ghcr.io/zarf-dev/packages/dos-games:1.2.0 -a skeleton`
$ zarf package pull oci://ghcr.io/zarf-dev/packages/dos-games:1.3.0 -a skeleton`
CmdPackagePullFlagOutputDirectory = "Specify the output directory for the pulled Zarf package"
CmdPackagePullFlagShasum = "Shasum of the package to pull. Required if pulling a https package. A shasum can be retrieved using 'zarf dev sha256sum <url>'"

Expand Down
4 changes: 2 additions & 2 deletions src/test/e2e/05_tarball_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -121,13 +121,13 @@ func TestDeterministicOCIPull(t *testing.T) {
// even with concurrent OCI layer downloads.

var (
ociRef = "oci://ghcr.io/zarf-dev/packages/dos-games:1.2.0"
ociRef = "oci://ghcr.io/zarf-dev/packages/dos-games:1.3.0"
cosignKey = "cosign.pub"
tmp = t.TempDir()
pull1Dir = filepath.Join(tmp, "pull1")
pull2Dir = filepath.Join(tmp, "pull2")
pull3Dir = filepath.Join(tmp, "pull3")
pkgName = fmt.Sprintf("zarf-package-dos-games-%s-1.2.0.tar.zst", e2e.Arch)
pkgName = fmt.Sprintf("zarf-package-dos-games-%s-1.3.0.tar.zst", e2e.Arch)
)

// Create output directories
Expand Down
4 changes: 2 additions & 2 deletions src/test/e2e/09_component_compose_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ func TestComposabilityExample(t *testing.T) {
- name: multi-games
namespace: dos-games
files:
- %s/oci/dirs/9ece174e362633b637e3c6b554b70f7d009d0a27107bee822336fdf2ce9a9def/manifests/multi-games-0.yaml
- %s/oci/dirs/9ece174e362633b637e3c6b554b70f7d009d0a27107bee822336fdf2ce9a9def/manifests/multi-games-1.yaml
- %s/oci/dirs/f1ca184d563e3ad29355ce14797e3ac68b7ef31e22461e494a27510c449949cf/manifests/multi-games-0.yaml
- %s/oci/dirs/f1ca184d563e3ad29355ce14797e3ac68b7ef31e22461e494a27510c449949cf/manifests/multi-games-1.yaml
images:
- ghcr.io/zarf-dev/doom-game:0.0.1
actions:
Expand Down
Loading