mirror of
https://github.com/imgproxy/imgproxy.git
synced 2025-10-09 19:52:30 +02:00
Merge branch 'master' into version/4
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -8,4 +8,5 @@ tmp/
|
|||||||
docker-base
|
docker-base
|
||||||
docs/sitemap.txt
|
docs/sitemap.txt
|
||||||
.env
|
.env
|
||||||
|
.imgproxyrc
|
||||||
k6/*.json
|
k6/*.json
|
||||||
|
36
Makefile
36
Makefile
@@ -1,6 +1,6 @@
|
|||||||
# imgproxy Makefile
|
# imgproxy Makefile
|
||||||
|
|
||||||
BINARY := imgproxy
|
BINARY := ./imgproxy
|
||||||
|
|
||||||
GOCMD := go
|
GOCMD := go
|
||||||
GOBUILD := $(GOCMD) build
|
GOBUILD := $(GOCMD) build
|
||||||
@@ -10,6 +10,7 @@ GOFMT := gofmt
|
|||||||
GOLINT := golangci-lint
|
GOLINT := golangci-lint
|
||||||
GOTESTSUM := gotestsum
|
GOTESTSUM := gotestsum
|
||||||
SRCDIR := ./cli
|
SRCDIR := ./cli
|
||||||
|
RCFILE := ./.imgproxyrc
|
||||||
BREW_PREFIX :=
|
BREW_PREFIX :=
|
||||||
|
|
||||||
# Common environment setup for CGO builds
|
# Common environment setup for CGO builds
|
||||||
@@ -29,6 +30,19 @@ ifdef BREW_PREFIX
|
|||||||
export CGO_LDFLAGS := $(CGO_LDFLAGS) -Wl,-no_warn_duplicate_libraries
|
export CGO_LDFLAGS := $(CGO_LDFLAGS) -Wl,-no_warn_duplicate_libraries
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
# Get build arguments
|
||||||
|
ifeq (build,$(firstword $(MAKECMDGOALS)))
|
||||||
|
BUILD_ARGS := $(wordlist 2,$(words $(MAKECMDGOALS)),$(MAKECMDGOALS))
|
||||||
|
endif
|
||||||
|
|
||||||
|
# Get run arguments
|
||||||
|
ifeq (run,$(firstword $(MAKECMDGOALS)))
|
||||||
|
RUN_ARGS := $(wordlist 2,$(words $(MAKECMDGOALS)),$(MAKECMDGOALS))
|
||||||
|
endif
|
||||||
|
ifeq (build-and-run,$(firstword $(MAKECMDGOALS)))
|
||||||
|
RUN_ARGS := $(wordlist 2,$(words $(MAKECMDGOALS)),$(MAKECMDGOALS))
|
||||||
|
endif
|
||||||
|
|
||||||
# Default target
|
# Default target
|
||||||
.PHONY: all
|
.PHONY: all
|
||||||
all: build
|
all: build
|
||||||
@@ -39,7 +53,7 @@ all: build
|
|||||||
# make build -- -o output_name
|
# make build -- -o output_name
|
||||||
.PHONY: build
|
.PHONY: build
|
||||||
build:
|
build:
|
||||||
@$(GOBUILD) -o $(BINARY) $(filter-out $@,$(MAKECMDGOALS)) $(SRCDIR); \
|
@$(GOBUILD) -o $(BINARY) $(BUILD_ARGS) $(SRCDIR)
|
||||||
|
|
||||||
# Clean
|
# Clean
|
||||||
.PHONY: clean
|
.PHONY: clean
|
||||||
@@ -48,6 +62,24 @@ clean:
|
|||||||
@$(GOCLEAN)
|
@$(GOCLEAN)
|
||||||
rm -f $(BINARY)
|
rm -f $(BINARY)
|
||||||
|
|
||||||
|
# Run imgproxy binary
|
||||||
|
#
|
||||||
|
# Usage:
|
||||||
|
# make run -- arg1 arg2
|
||||||
|
#
|
||||||
|
# If .imgproxyrc exists, it will be sourced before running the binary.
|
||||||
|
.PHONY: run
|
||||||
|
run: SHELL := bash
|
||||||
|
run:
|
||||||
|
ifneq (,$(wildcard $(RCFILE)))
|
||||||
|
@source $(RCFILE) && $(BINARY) $(RUN_ARGS)
|
||||||
|
else
|
||||||
|
@$(BINARY) $(RUN_ARGS)
|
||||||
|
endif
|
||||||
|
|
||||||
|
.PHONY: build-and-run
|
||||||
|
build-and-run: build run
|
||||||
|
|
||||||
# Run tests
|
# Run tests
|
||||||
#
|
#
|
||||||
# Usage:
|
# Usage:
|
||||||
|
Reference in New Issue
Block a user