Infrastructure/zot
0
Fork 0
mirror of https://github.com/project-zot/zot.git synced 2024-12-30 22:34:13 -05:00
Code Issues Activity

fix: swagger Makefile target broken on darwin (#1701)

Browse source 
Signed-off-by: Alexei Dodon <adodon@cisco.com>
This commit is contained in:
Alexei Dodon 2023-08-15 23:07:56 +03:00 committed by GitHub
parent e129d4003b
commit e510df7c22
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/ci-cd.yml vendored
View file

@ -66,7 +66,7 @@ jobs:
- name: Install other dependencies
run: |
cd $GITHUB_WORKSPACE
go install github.com/swaggo/swag/cmd/swag@v1.6.3
go install github.com/swaggo/swag/cmd/swag@v1.8.12
sudo apt-get update
sudo apt-get install rpm
sudo apt-get install snapd
@ -77,7 +77,7 @@ jobs:
sudo cp bin/skopeo /usr/bin && \
rm -rf $GITHUB_WORKSPACE/src/github.com/containers/skopeo
cd $GITHUB_WORKSPACE
curl -Lo notation.tar.gz https://github.com/notaryproject/notation/releases/download/v0.7.1-alpha.1/notation_0.7.1-alpha.1_linux_amd64.tar.gz
curl -Lo notation.tar.gz https://github.com/notaryproject/notation/releases/download/v1.0.0-rc.4/notation_1.0.0-rc.4_linux_amd64.tar.gz
sudo tar xvzf notation.tar.gz -C /usr/bin notation
rm -f notation.tar.gz
go install github.com/wadey/gocovmerge@latest

6
Makefile
View file

@ -216,13 +216,11 @@ check: ./golangcilint.yaml $(GOLINTER)
$(GOLINTER) --config ./golangcilint.yaml run --enable-all --out-format=colored-line-number --build-tags stress,$(BUILD_LABELS),containers_image_openpgp ./...
rm pkg/extensions/build/.empty
swagger/docs.go:
.PHONY: swagger
swagger:
swag -v || go install github.com/swaggo/swag/cmd/swag@$(SWAGGER_VERSION)
swag init --parseDependency -o swagger -g pkg/api/routes.go -q
.PHONY: swagger
swagger: swagger/docs.go pkg/api/routes.go
.PHONY: update-licenses
update-licenses:
@echo "Detecting and updating licenses ... please be patient!"

2
pkg/api/routes.go
View file

@ -401,7 +401,7 @@ func (rh *RouteHandler) ListTags(response http.ResponseWriter, request *http.Req
// @Param name path string true "repository name"
// @Param reference path string true "image reference or digest"
// @Success 200 {string} string "ok"
// @Header 200 {object} cosntants.DistContentDigestKey
// @Header 200 {object} constants.DistContentDigestKey
// @Failure 404 {string} string "not found"
// @Failure 500 {string} string "internal server error".
func (rh *RouteHandler) CheckManifest(response http.ResponseWriter, request *http.Request) {

2
swagger/docs.go
View file

@ -1005,7 +1005,7 @@ const docTemplate = `{
"type": "string"
},
"headers": {
"cosntants.DistContentDigestKey": {
"constants.DistContentDigestKey": {
"type": "object"
}
}

2
swagger/swagger.json
View file

@ -996,7 +996,7 @@
"type": "string"
},
"headers": {
"cosntants.DistContentDigestKey": {
"constants.DistContentDigestKey": {
"type": "object"
}
}

2
swagger/swagger.yaml
View file

@ -858,7 +858,7 @@ paths:
"200":
description: ok
headers:
cosntants.DistContentDigestKey:
constants.DistContentDigestKey:
type: object
schema:
type: string