Skip to content

Commit

Permalink
Remove references to atomic
Browse files Browse the repository at this point in the history
Move signature yaml file to point at /var/lib/containers/sigstore.

Change skopeo-copy.1 to use containers-storage and docker transports
rather then atomic.

Signed-off-by: Daniel J Walsh <[email protected]>
  • Loading branch information
rhatdan committed Oct 31, 2019
1 parent 153520e commit ce2db02
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ INSTALLDIR=${PREFIX}/bin
MANINSTALLDIR=${PREFIX}/share/man
CONTAINERSSYSCONFIGDIR=${DESTDIR}/etc/containers
REGISTRIESDDIR=${CONTAINERSSYSCONFIGDIR}/registries.d
SIGSTOREDIR=${DESTDIR}/var/lib/atomic/sigstore
SIGSTOREDIR=${DESTDIR}/var/lib/containers/sigstore
BASHINSTALLDIR=${PREFIX}/share/bash-completion/completions
GO ?= go
CONTAINER_RUNTIME := $(shell command -v podman 2> /dev/null || echo docker)
Expand Down
4 changes: 2 additions & 2 deletions default.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@

# This is the default signature write location for docker registries.
default-docker:
# sigstore: file:///var/lib/atomic/sigstore
sigstore-staging: file:///var/lib/atomic/sigstore
# sigstore: file:///var/lib/containers/sigstore
sigstore-staging: file:///var/lib/containers/sigstore

# The 'docker' indicator here is the start of the configuration
# for docker registries.
Expand Down
2 changes: 1 addition & 1 deletion docs/skopeo-copy.1.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ $ ls /var/lib/images/busybox/*
To copy and sign an image:

```sh
$ skopeo copy --sign-by [email protected] atomic:example/busybox:streaming atomic:example/busybox:gold
# skopeo copy --sign-by [email protected] container-storage:example/busybox:streaming docker://example/busybox:gold
```

## SEE ALSO
Expand Down

0 comments on commit ce2db02

Please sign in to comment.