Skip to content

Commit

Permalink
remove docker-generate and docker-notation code (notaryproject#269)
Browse files Browse the repository at this point in the history
* remove docker-generate and docker-notation code
* clean cicd file and makefile

Signed-off-by: zaihaoyin <[email protected]>
  • Loading branch information
chloeyin authored Jul 28, 2022
1 parent 20bb2ca commit 433d02f
Show file tree
Hide file tree
Showing 23 changed files with 3 additions and 931 deletions.
34 changes: 0 additions & 34 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,40 +16,6 @@ builds:
goarch: arm64
ldflags:
- -s -w -X {{.ModulePath}}/internal/version.Version={{.Version}} -X {{.ModulePath}}/internal/version.BuildMetadata=
- main: ./cmd/docker-notation
id: docker-notation
binary: docker-notation
env:
- CGO_ENABLED=0
goos:
- linux
- darwin
- windows
goarch:
- amd64
- arm64
ignore:
- goos: windows
goarch: arm64
ldflags:
- -s -w -X {{.ModulePath}}/internal/version.Version={{.Version}} -X {{.ModulePath}}/internal/version.BuildMetadata=
- main: ./cmd/docker-generate
id: docker-generate
binary: docker-generate
env:
- CGO_ENABLED=0
goos:
- linux
- darwin
- windows
goarch:
- amd64
- arm64
ignore:
- goos: windows
goarch: arm64
ldflags:
- -s -w
archives:
- format: tar.gz
format_overrides:
Expand Down
9 changes: 2 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
MODULE = github.com/notaryproject/notation
DOCKER_PLUGINS = docker-generate docker-notation
COMMANDS = notation $(DOCKER_PLUGINS)
COMMANDS = notation
GIT_TAG = $(shell git describe --tags --abbrev=0 --exact-match 2>/dev/null)
BUILD_METADATA =
ifeq ($(GIT_TAG),) # unreleased build
Expand Down Expand Up @@ -52,7 +51,7 @@ vendor: ## vendores the go modules
GO111MODULE=on go mod vendor

.PHONY: install
install: install-notation install-docker-plugins ## install the notation cli and docker plugins
install: install-notation ## install the notation cli

.PHONY: install-notation
install-notation: bin/notation ## installs the notation cli
Expand All @@ -61,7 +60,3 @@ install-notation: bin/notation ## installs the notation cli
.PHONY: install-docker-%
install-docker-%: bin/docker-%
cp $< ~/.docker/cli-plugins/

.PHONY: install-docker-plugins
install-docker-plugins: $(addprefix install-,$(DOCKER_PLUGINS)) ## installs the docker plugins
cp $(addprefix bin/,$(DOCKER_PLUGINS)) ~/.docker/cli-plugins/
4 changes: 0 additions & 4 deletions building.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,13 @@
The notation repo contains the following:

- `notation` - A CLI for signing and verifying artifacts with Notation
- `docker-generate` - Extends docker with `docker generate` to create locally persisted manifest for signing, without having to push to a registry.
- `docker-notation` - Extends docker with `docker notation` to enable, sign and verify Notation signatures.

Building above binaries require [golang](https://golang.org/dl/) with version `>= 1.17`.

## Windows with WSL

- Build the binaries, installing them to:
- `~/bin/notation`
- `~/.docker/cli-plugins/docker-generate`
- `~/.docker/cli-plugins/docker-notation`
```sh
git clone https://github.com/notaryproject/notation.git
cd notation
Expand Down
13 changes: 0 additions & 13 deletions cmd/docker-generate/generate.go

This file was deleted.

11 changes: 0 additions & 11 deletions cmd/docker-generate/generate_test.go

This file was deleted.

17 changes: 0 additions & 17 deletions cmd/docker-generate/main.go

This file was deleted.

78 changes: 0 additions & 78 deletions cmd/docker-generate/manifest.go

This file was deleted.

77 changes: 0 additions & 77 deletions cmd/docker-generate/manifest_test.go

This file was deleted.

29 changes: 0 additions & 29 deletions cmd/docker-generate/metadata.go

This file was deleted.

40 changes: 0 additions & 40 deletions cmd/docker-generate/metadata_test.go

This file was deleted.

Loading

0 comments on commit 433d02f

Please sign in to comment.