Merge pull request #3 from joxz/labels

Labels

Author: joxz

.travis.yml

@@ -7,19 +7,10 @@ env:
     - IMAGE_NAME=jones2748/docker-testcl
 
 script:
-  # build latest image always
-  - docker build --no-cache -t $IMAGE_NAME:latest .
-  # build the tagged image
-  #- if [[ $TRAVIS_TAG = $TRAVIS_BRANCH ]]; then docker build -t $IMAGE_NAME:$TRAVIS_BRANCH .; else true ; fi
-  - docker run -it --rm $IMAGE_NAME test
-  - docker run -it --rm $IMAGE_NAME test_irule
+  - make build
+  - make test
 
 after_script:
   - docker images
-
-#after_success:
-#  - docker login -u="$DOCKERHUB_USER" -p="$DOCKERHUB_PW"
-#  # push to latest if master branch
-#  - if [[ $TRAVIS_BRANCH = master ]]; then docker push $IMAGE_NAME:latest; else true; fi
-#  # push tag as well
-#  - if [[ $TRAVIS_TAG = $TRAVIS_BRANCH ]]; then docker push $IMAGE_NAME:$TRAVIS_TAG; else true ; fi
+  - make inspect | jq .
+  - make history

Dockerfile

@@ -26,7 +26,7 @@ COPY ./test/ /opt/test
 
 FROM adoptopenjdk/openjdk11-openj9:alpine-slim
 
-LABEL maintainer="https://hub.docker.com/u/jones2748"
+LABEL maintainer="Johannes Denninger"
 
 ENV TCLLIBPATH=/opt/TesTcl
 ENV PATH /opt/jtcl:/opt/test:/app:$PATH

Makefile

@@ -1,28 +1,55 @@
-.RECIPEPREFIX +=
+DOCKERHUB_USER = jones2748
+REPONAME = docker-testcl
+DOCKERHUB = $(DOCKERHUB_USER)/$(REPONAME)
+GITHUB_USER = joxz
+GITHUB = https://github.com/$(GITHUB_USER)/$(REPONAME)
+VER = $(shell git rev-parse --short HEAD)
+CONTAINERNAME = $(DOCKERHUB):$(VER)
+
+BUILDFLAGS = \
+  --compress \
+  --force-rm \
+  --label org.label-schema.schema-version="1.0" \
+  --label org.label-schema.description="Docker container for testing iRules with TesTcl" \
+  --label org.label-schema.vcs-url="$(GITHUB)" \
+  --label org.label-schema.vcs-ref="$(VER)" \
+  --label org.label-schema.docker.cmd="docker run -it --rm $(CONTAINERNAME)" \
+  --label org.label-schema.name="$(DOCKERHUB)" \
+  --label org.label-schema.build-date="$(shell date -u +"%Y-%m-%dT%H:%M:%SZ")"
 
-DOCKERHUB = jones2748/docker-testcl
 
 default: help
 
 
 build:  ## build container
- @docker build -t $(DOCKERHUB) .
+	@docker build $(BUILDFLAGS) -t $(CONTAINERNAME) .
 
 build-no-cache:  ## build container without cache
- @docker build --no-cache -t $(DOCKERHUB) .
+	@docker build --no-cache $(BUILDFLAGS) -t $(CONTAINERNAME) .
 
 run:  ## run container
- @docker run -it --rm $(DOCKERHUB)
+	@docker run -it --rm $(CONTAINERNAME)
 
 clean:  ## remove images
- @docker rmi $(DOCKERHUB)
+	@docker rmi $(CONTAINERNAME)
+
+.PHONY: inspect
+inspect:  ## inspect container properties - pretty: 'make inspect | jq .' requires jq
+	@docker inspect -f "{{json .ContainerConfig }}" $(CONTAINERNAME)
 
 .PHONY: test
 test:  ## test container with builtin tests
- docker run -it --rm $(DOCKERHUB) test
- docker run -it --rm $(DOCKERHUB) test_irule
+	docker run -it --rm $(CONTAINERNAME) test
+	docker run -it --rm $(CONTAINERNAME) test_irule
+
+.PHONY: logs
+logs: ## show docker logs for container (ONLY possible while container is running)
+	@docker logs -f $(CONTAINERNAME)
 
+.PHONY: history
+history:  ## show docker history for container
+	@docker history $(CONTAINERNAME)
 
 .PHONY: help
 help:  ## this help
- @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
+	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'

README.md

@@ -100,8 +100,11 @@ build                          build container
 build-no-cache                 build container without cache
 clean                          remove images
 help                           this help
+inspect                        inspect container properties - pretty: 'make inspect | jq .' requires jq
+logs                           show docker logs for container (ONLY possible while container is running)
 run                            run container
 test                           test container with builtin tests
+
 ```
 
 ## TODO