Skip to content

Commit 679e869

Browse files
committed
Made docker tag configurable
1 parent cf54e86 commit 679e869

File tree

3 files changed

+17
-3
lines changed

3 files changed

+17
-3
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ deb-rere: deb-rebuild deb-reinstall ## Rebuild and reinstall deb package
4343

4444
docker: ## Build Docker image
4545
$(MCIS) $(POM) -am -pl :rdf-processing-toolkit-pkg-docker-cli $(ARGS)
46-
cd rdf-processing-toolkit-pkg-parent/rdf-processing-toolkit-pkg-docker-cli && $(MS) jib:dockerBuild && cd ../..
46+
cd rdf-processing-toolkit-pkg-parent/rdf-processing-toolkit-pkg-docker-cli && $(MS) $(ARGS) jib:dockerBuild && cd ../..
4747

4848
release-bundle: ## Create files for Github upload
4949
@set -eu

README.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,17 @@ make release-bundle # Create files for Github upload
111111
112112
A docker image is available at https://registry.hub.docker.com/r/aksw/rpt
113113
114+
The docker image can be built with a custom tag by setting the property `docker.tag`.
115+
The default for `docker.tag` is `${docker.tag.prefix}${project.version}`, where `docker.tag.prefix` defaults to the empty string.
116+
When only setting `docker.tag.prefix` to e.g. `myfork-` then the tag will have the form `myfork-1.2.3-SNAPSHOT`.
117+
118+
```bash
119+
make docker
120+
121+
# Example for providing a custom docker tag via make:
122+
make docker ARGS='-D"docker.tag.prefix=experimental-"'
123+
```
124+
114125
## License
115126
The source code of this repo is published under the [Apache License Version 2.0](LICENSE).
116127
Dependencies may be licensed under different terms. When in doubt please refer to the licenses of the dependencies declared in the `pom.xml` files.

rdf-processing-toolkit-pkg-parent/rdf-processing-toolkit-pkg-docker-cli/pom.xml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
<!-- <deb.jarFile>${project.artifactId}-${project.version}.jar</deb.jarFile> -->
1616
<!-- <deb.jarFile>${project.artifactId}-${project.version}-jar-with-dependencies.jar</deb.jarFile> -->
1717
<deb.jarFile>${project.artifactId}-${project.version}.jar</deb.jarFile>
18+
19+
<docker.tag.prefix></docker.tag.prefix>
20+
<docker.tag>${docker.tag.prefix}${project.version}</docker.tag>
1821
</properties>
1922
<build>
2023
<plugins>
@@ -40,8 +43,8 @@
4043
<!-- <image>docker.io/aklakan/rdf-processing-toolkit</image> -->
4144
<image>docker.io/aksw/rpt</image>
4245
<tags>
43-
<tag>${project.version}</tag>
44-
<tag>latest</tag>
46+
<tag>${docker.tag}</tag>
47+
<!-- <tag>latest</tag> -->
4548
</tags>
4649
</to>
4750
<from>

0 commit comments

Comments
 (0)