Skip to content

Commit 5bc6605

Browse files
committed
Resolve conflict with Makefile updated by nightly
1 parent 680fa57 commit 5bc6605

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

Makefile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,17 @@ DOCKER ?= docker
22
INPUT_RELEASE_VERSION ?= 0.4.0
33
RUST_VERSION ?= 1.55.0
44
REPO ?= rustserverless/lambda-rust
5+
TAG ?= latest
56

67
publish: build
7-
$(DOCKER) push $(REPO):latest
8+
$(DOCKER) push $(REPO):${TAG}
89

910
publish-tag: build publish
10-
$(DOCKER) tag $(REPO):latest "$(REPO):$(INPUT_RELEASE_VERSION)-rust-$(RUST_VERSION)"
11+
$(DOCKER) tag $(REPO):${TAG} "$(REPO):$(INPUT_RELEASE_VERSION)-rust-$(RUST_VERSION)"
1112
$(DOCKER) push "$(REPO):$(INPUT_RELEASE_VERSION)-rust-$(RUST_VERSION)"
1213

1314
build:
14-
$(DOCKER) build --build-arg RUST_VERSION=$(RUST_VERSION) -t $(REPO):latest .
15+
$(DOCKER) build --build-arg RUST_VERSION=$(RUST_VERSION) -t $(REPO):${TAG} .
1516

1617
test:
1718
@tests/test.sh
@@ -23,7 +24,7 @@ debug: build
2324
-v ${HOME}/.cargo/registry:/cargo/registry \
2425
-v ${HOME}/.cargo/git:/cargo/git \
2526
--entrypoint=/bin/bash \
26-
$(REPO)
27+
$(REPO):$(TAG)
2728

2829
check:
2930
$(DOCKER) run --rm \

0 commit comments

Comments
 (0)