Skip to content

Commit 661a16e

Browse files
committed
reset makefile
1 parent 5d21785 commit 661a16e

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

Makefile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ DOCKER_NETWORK?=test
33
DOCKER_NETWORK_ALIAS=nginx-plus-test
44
DOCKER_NGINX_PLUS?=nginx-plus
55
DOCKER_NGINX_PLUS_HELPER?=nginx-plus-helper
6-
NGINX_REPO_URL?=pkgs-test.nginx.com
7-
NGINX_CERT_DIR?=docker
86

97
GOLANG_CONTAINER=golang:1.19
108

@@ -18,7 +16,7 @@ lint:
1816
docker run --pull always --rm -v $(shell pwd):/nginx-plus-go-client -w /nginx-plus-go-client -v $(shell go env GOCACHE):/cache/go -e GOCACHE=/cache/go -e GOLANGCI_LINT_CACHE=/cache/go -v $(shell go env GOPATH)/pkg:/go/pkg golangci/golangci-lint:latest golangci-lint --color always run
1917

2018
docker-build:
21-
docker build --secret id=nginx-repo.crt,src=${NGINX_CERT_DIR}/nginx-repo.crt --secret id=nginx-repo.key,src=${NGINX_CERT_DIR}/nginx-repo.key --build-arg NGINX_PLUS_VERSION=$(NGINX_PLUS_VERSION) --build-arg NGINX_REPO_URL=$(NGINX_REPO_URL) -t nginx-plus:$(NGINX_PLUS_VERSION) docker
19+
docker build --secret id=nginx-repo.crt,src=docker/nginx-repo.crt --secret id=nginx-repo.key,src=docker/nginx-repo.key --build-arg NGINX_PLUS_VERSION=$(NGINX_PLUS_VERSION) -t nginx-plus:$(NGINX_PLUS_VERSION) docker
2220

2321
run-nginx-plus:
2422
docker network create --driver bridge $(DOCKER_NETWORK)

0 commit comments

Comments
 (0)