Skip to content

Commit 9f8991f

Browse files
Makefile cleanup
1 parent 16ea0fe commit 9f8991f

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,24 +25,24 @@ build-nginx:
2525
SUCCESS=$$? ; \
2626
docker rmi $$(docker images --filter=label=stage=builder --quiet); \
2727
if [ "$$SUCCESS" -ne 0 ] ; \
28-
then echo "${RED} Build failed :(${NC}" ; \
29-
else echo "${GREEN}✓ Successfully built NGINX module ${NC}" ; fi
28+
then echo "${RED} Build failed ${NC}"; \
29+
else echo "${GREEN}✓ Successfully built NGINX module ${NC}"; fi
3030

3131
.PHONY: rebuild-nginx
3232
rebuild-nginx:
3333
@echo "${BLUE} Rebuilding...${NC}"
3434
@docker image pull debian:bullseye-slim
3535
@docker image pull nginx:${NGINX_VERSION}
36-
@docker image build -t ${DOCKER_ORG_NAME}/${DOCKER_IMAGE_NAME}:latest -t ${DOCKER_ORG_NAME}/${DOCKER_IMAGE_NAME}:${NGINX_VERSION} --build-arg NGINX_VERSION=${NGINX_VERSION} . --no-cache ; \
36+
@docker image build -t ${DOCKER_ORG_NAME}/${DOCKER_IMAGE_NAME}:latest -t ${DOCKER_ORG_NAME}/${DOCKER_IMAGE_NAME}:${NGINX_VERSION} --build-arg NGINX_VERSION=${NGINX_VERSION} --no-cache .; \
3737
SUCCESS=$$? ; \
3838
docker rmi $$(docker images --filter=label=stage=builder --quiet); \
3939
if [ "$$SUCCESS" -ne 0 ] ; \
40-
then echo "${RED} Build failed :(${NC}" ; \
41-
else echo "${GREEN}✓ Successfully rebuilt NGINX module ${NC}" ; fi
40+
then echo "${RED} Build failed ${NC}"; \
41+
else echo "${GREEN}✓ Successfully rebuilt NGINX module ${NC}"; fi
4242

4343
.PHONY: stop-nginx
4444
stop-nginx:
45-
docker stop $(shell docker inspect --format="{{.Id}}" "$(DOCKER_IMAGE_NAME)") ||:
45+
docker stop "${DOCKER_IMAGE_NAME}"
4646

4747
.PHONY: start-nginx
4848
start-nginx:

0 commit comments

Comments
 (0)