realloc/frostfs-rest-gw
1
0
Fork 0
forked from TrueCloudLab/frostfs-rest-gw
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#65] Typo fixes

Browse source 
SWAGGER_URL must be defined externally and fall back to default only
when not set.

Signed-off-by: Stanislav Bogatyrev <stanislav@nspcc.ru>
This commit is contained in:
Stanislav Bogatyrev 2022-09-12 09:51:35 +03:00 committed by Stanislav Bogatyrev
parent a3e196c5d4
commit 843f099108
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Makefile
View file

@ -21,7 +21,7 @@ ifeq ($(UNAME), "Darwin/x86_64")
SWAGGER_ARCH = darwin_amd64 SWAGGER_ARCH = darwin_amd64
endif endif
SWAGGER_URL = "https://github.com/go-swagger/go-swagger/releases/download/$(SWAGGER_VERSION)/swagger_$(SWAGGER_ARCH)" SWAGGER_URL ?= "https://github.com/go-swagger/go-swagger/releases/download/$(SWAGGER_VERSION)/swagger_$(SWAGGER_ARCH)"
# List of binaries to build. For now just one. # List of binaries to build. For now just one.
BINDIR = bin BINDIR = bin
@ -63,8 +63,8 @@ endif
# Generate server by swagger spec # Generate server by swagger spec
generate-server: swagger generate-server: swagger
./bin/swagger generate server -t gen -f ./spec/rest.yaml --exclude-main \ ./bin/swagger generate server -t gen -f ./spec/rest.yaml --exclude-main \
-A neofs-rest-gw -P models.Principal \ -A neofs-rest-gw -P models.Principal \
-C templates/server-config.yaml --template-dir templates -C templates/server-config.yaml --template-dir templates
# Run tests # Run tests
test: test:
@ -115,11 +115,11 @@ lint:
docker/all: docker/all:
@echo "=> Running 'make all' in clean Docker environment" && \ @echo "=> Running 'make all' in clean Docker environment" && \
docker run --rm -t \ docker run --rm -t \
-v `pwd`:/src \ -v `pwd`:/src \
-w /src \ -w /src \
-u `stat -c "%u:%g" .` \ -u `stat -c "%u:%g" .` \
--env HOME=/src \ --env HOME=/src \
golang:$(GO_VERSION) make all golang:$(GO_VERSION) make all
# Generate server by swagger spec using swagger docker image # Generate server by swagger spec using swagger docker image
docker/generate-server: docker/generate-server:
@ -131,7 +131,7 @@ docker/generate-server:
quay.io/goswagger/swagger:$(SWAGGER_VERSION) generate server \ quay.io/goswagger/swagger:$(SWAGGER_VERSION) generate server \
-t gen -f ./spec/rest.yaml --exclude-main \ -t gen -f ./spec/rest.yaml --exclude-main \
-A neofs-rest-gw -P models.Principal \ -A neofs-rest-gw -P models.Principal \
-C templates/server-config.yaml --template-dir templates -C templates/server-config.yaml --template-dir templates
# Run linters in Docker # Run linters in Docker
docker/lint: docker/lint: