Skip to content

Commit 2e2136d

Browse files
committed
Remove alpine Dockerfile
Fixes #267
1 parent 5515ee4 commit 2e2136d

File tree

3 files changed

+11
-167
lines changed

3 files changed

+11
-167
lines changed

Dockerfile-alpine

Lines changed: 0 additions & 61 deletions
This file was deleted.

Dockerfile-ubuntu

Lines changed: 0 additions & 68 deletions
This file was deleted.

Makefile

Lines changed: 11 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ GPG_KEYNAME := $$(awk -F'[<>]' '/<gpg.keyname>/ { print $$3 }' pom.xml)
1313

1414
TODAY := $(shell date -u +'%Y.%m.%d')
1515

16-
RELEASE_VERSION ?= 2.14.0
17-
1816
### TARGETS ###
1917
#
2018

@@ -38,7 +36,7 @@ native-image: clean ## Build the native image
3836
.PHONY: docker-image-dev
3937
docker-image-dev: binary ## Build Docker image with the local PerfTest version
4038
@docker build \
41-
--file Dockerfile-ubuntu \
39+
--file Dockerfile \
4240
--tag pivotalrabbitmq/perf-test:dev-$(TODAY) \
4341
.
4442

@@ -50,49 +48,24 @@ test-docker-image-dev: ## Test the Docker image with the local PerfTest version
5048
push-docker-image-dev: ## Push the Docker image with the local PerfTest version
5149
@docker push pivotalrabbitmq/perf-test:dev-$(TODAY)
5250

53-
.PHONY: docker-image-alpine
54-
docker-image-alpine: binary ## Build Alpine-based Docker image
51+
.PHONY: docker-image
52+
docker-image: binary ## Build Ubuntu-based Docker image
5553
@docker build \
56-
--file Dockerfile-alpine \
57-
--tag pivotalrabbitmq/perf-test:$(RELEASE_VERSION)-alpine \
58-
.
59-
60-
.PHONY: test-docker-image-alpine
61-
test-docker-image-alpine: ## Test the Alpine-based Docker image
62-
@docker run -it --rm pivotalrabbitmq/perf-test:$(RELEASE_VERSION)-alpine --version
63-
64-
.PHONY: docker-image-ubuntu
65-
docker-image-ubuntu: binary ## Build Ubuntu-based Docker image
66-
@docker build \
67-
--file Dockerfile-ubuntu \
68-
--tag pivotalrabbitmq/perf-test:$(RELEASE_VERSION)-ubuntu \
69-
--tag pivotalrabbitmq/perf-test:$(RELEASE_VERSION) \
54+
--file Dockerfile \
7055
--tag pivotalrabbitmq/perf-test:latest \
7156
.
7257

73-
.PHONY: test-docker-image-ubuntu
74-
test-docker-image-ubuntu: ## Test the Ubuntu-based Docker image
75-
@docker run -it --rm pivotalrabbitmq/perf-test:$(RELEASE_VERSION)-ubuntu --version
76-
77-
.PHONY: docker-images
78-
docker-images: docker-image-alpine docker-image-ubuntu ## Build Docker images
79-
80-
.PHONY: test-docker-images
81-
test-docker-images: test-docker-image-alpine test-docker-image-ubuntu ## Test the Docker images
58+
.PHONY: test-docker-image
59+
test-docker-image: ## Test the Ubuntu-based Docker image
60+
@docker run -it --rm pivotalrabbitmq/perf-test:latest --version
8261

83-
.PHONY: push-docker-images
84-
push-docker-images: ## Push docker images to Docker Hub
85-
@docker push pivotalrabbitmq/perf-test:$(RELEASE_VERSION)-ubuntu
86-
@docker push pivotalrabbitmq/perf-test:$(RELEASE_VERSION)
62+
.PHONY: push-docker-image
63+
push-docker-image: ## Push docker image to Docker Hub
8764
@docker push pivotalrabbitmq/perf-test:latest
88-
@docker push pivotalrabbitmq/perf-test:$(RELEASE_VERSION)-alpine
8965

90-
.PHONY: delete-docker-images
91-
delete-docker-images: ## Delete the created Docker images from the local machine
92-
@docker rmi pivotalrabbitmq/perf-test:$(RELEASE_VERSION)-ubuntu
93-
@docker rmi pivotalrabbitmq/perf-test:$(RELEASE_VERSION)
66+
.PHONY: delete-docker-image
67+
delete-docker-image: ## Delete the created Docker image from the local machine
9468
@docker rmi pivotalrabbitmq/perf-test:latest
95-
@docker rmi pivotalrabbitmq/perf-test:$(RELEASE_VERSION)-alpine
9669

9770
.PHONY: package-native-image
9871
package-native-image: native-image ## Package the native image

0 commit comments

Comments
 (0)