From a08de3aa5018b6068a49d9366c2a1ce377b819d9 Mon Sep 17 00:00:00 2001 From: Marat Abrarov Date: Tue, 6 Apr 2021 02:45:36 +0300 Subject: [PATCH] Migrated to Docker Maven Plugin 0.35.0 which officially supports copy goal and to the latest version of Redis - 6.2.1. --- .travis.yml | 2 +- README.md | 25 ++++++++++--------------- docker-compose.yml | 6 +++--- helper-image/pom.xml | 2 +- j2cli-builder-image/pom.xml | 2 +- j2cli-dist/pom.xml | 2 +- j2cli-image/pom.xml | 2 +- pom.xml | 8 ++++---- redis-builder-image/pom.xml | 2 +- redis-dist/pom.xml | 2 +- redis-image/pom.xml | 2 +- redis-init-image/pom.xml | 2 +- 12 files changed, 26 insertions(+), 31 deletions(-) diff --git a/.travis.yml b/.travis.yml index cc58b4d..f853fc0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ services: env: global: - DOCKER_COMPOSE_VERSION: '1.27.4' - - REDIS_VERSION: '6.0.9' + - REDIS_VERSION: '6.2.1' - REDIS_SHA256: '2819b6d9c56be1f25cd157b9cb6b7c2733edcb46f4f6bcb1b79cefe639a2853b' - J2CLI_VERSION: '0.3.10' - DOCKERHUB_USER: 'abrarov' diff --git a/README.md b/README.md index d2a4463..bb4366e 100644 --- a/README.md +++ b/README.md @@ -16,24 +16,19 @@ Builder of Docker image with [Redis](https://github.com/redis/redis) using 1. If remote Docker instance is used then `DOCKER_HOST` environment variable should point to that engine and include the schema, like `tcp://docker-host:2375` instead of `docker-host:2375`. 1. The current directory is a directory where this repository is cloned. -1. docker-maven-plugin 0.34-SNAPSHOT from - [copy_mojo](https://github.com/mabrarov/docker-maven-plugin/tree/copy_mojo) branch - of [mabrarov/docker-maven-plugin](https://github.com/mabrarov/docker-maven-plugin) GitHub project - is built and installed into the local Maven repository. - Refer to [docker-maven-plugin issue #752](https://github.com/fabric8io/docker-maven-plugin/issues/752) for details. ### Building Steps Building with [Maven Wrapper](https://github.com/takari/maven-wrapper): ```bash -./mvnw clean package -Ddocker-maven-plugin.version=0.34-SNAPSHOT +./mvnw clean package ``` or on Windows: ```bash -mvnw.cmd clean package -Ddocker-maven-plugin.version=0.34-SNAPSHOT +mvnw.cmd clean package ``` ## Testing @@ -41,19 +36,19 @@ mvnw.cmd clean package -Ddocker-maven-plugin.version=0.34-SNAPSHOT 1. Redis version ```bash - docker run --rm abrarov/redis:6.0.9-1.0.5 + docker run --rm abrarov/redis:6.2.1-1.1.0 ``` Expected output looks like: ```text - Redis server v=6.0.9 sha=00000000:0 malloc=jemalloc-5.1.0 bits=64 build=e9b33d1e886db04a + Redis server v=6.2.1 sha=00000000:0 malloc=jemalloc-5.1.0 bits=64 build=a93dda0c16dc7a5c ``` 1. [Redis CLI](https://github.com/redis/redis#playing-with-redis) ```bash - container_id="$(docker run -d abrarov/redis:6.0.9-1.0.5 redis-server)" && \ + container_id="$(docker run -d abrarov/redis:6.2.1-1.1.0 redis-server)" && \ docker exec "${container_id}" redis-cli ping && \ docker rm -fv "${container_id}" > /dev/null ``` @@ -67,13 +62,13 @@ mvnw.cmd clean package -Ddocker-maven-plugin.version=0.34-SNAPSHOT 1. j2cli version ```bash - docker run --rm abrarov/j2cli:0.3.10-1.0.5 + docker run --rm abrarov/j2cli:0.3.10-1.1.0 ``` Expected output is: ```text - j2cli 0.3.10, Jinja2 2.11.2 + j2cli 0.3.10, Jinja2 2.11.3 ``` ## Docker Compose @@ -89,7 +84,7 @@ Assuming the current directory is a directory where this repository is cloned. * Test connection to Redis ```bash - docker run --rm --network redis_default abrarov/redis:6.0.9-1.0.5 redis-cli -h redis ping + docker run --rm --network redis_default abrarov/redis:6.2.1-1.1.0 redis-cli -h redis ping ``` Expected output is: @@ -101,7 +96,7 @@ Assuming the current directory is a directory where this repository is cloned. * Put some data into Redis ```bash - docker run --rm --network redis_default abrarov/redis:6.0.9-1.0.5 redis-cli -h redis set foo bar + docker run --rm --network redis_default abrarov/redis:6.2.1-1.1.0 redis-cli -h redis set foo bar ``` Expected output is: @@ -125,7 +120,7 @@ Assuming the current directory is a directory where this repository is cloned. * Test persistence of stored data ```bash - docker run --rm --network redis_default abrarov/redis:6.0.9-1.0.5 redis-cli -h redis get foo + docker run --rm --network redis_default abrarov/redis:6.2.1-1.1.0 redis-cli -h redis get foo ``` Expected output is: diff --git a/docker-compose.yml b/docker-compose.yml index d076056..2e06e3f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,13 +15,13 @@ volumes: services: helper: - image: '${IMAGE_REGISTRY:-abrarov}/redis-helper:${PROJECT_VERSION:-1.0.5}' + image: '${IMAGE_REGISTRY:-abrarov}/redis-helper:${PROJECT_VERSION:-1.1.0}' read_only: true volumes: - *helper-dir init: - image: '${IMAGE_REGISTRY:-abrarov}/redis-init:${PROJECT_VERSION:-1.0.5}' + image: '${IMAGE_REGISTRY:-abrarov}/redis-init:${PROJECT_VERSION:-1.1.0}' command: *helper-wrapper-script environment: INIT_COMMAND: '/run.sh' @@ -38,7 +38,7 @@ services: - 'helper:ro' redis: - image: '${IMAGE_REGISTRY:-abrarov}/redis:${REDIS_VERSION:-6.0.9}-${PROJECT_VERSION:-1.0.5}' + image: '${IMAGE_REGISTRY:-abrarov}/redis:${REDIS_VERSION:-6.2.1}-${PROJECT_VERSION:-1.1.0}' command: - *helper-dockerize - '-wait' diff --git a/helper-image/pom.xml b/helper-image/pom.xml index b143152..1704bc9 100644 --- a/helper-image/pom.xml +++ b/helper-image/pom.xml @@ -5,7 +5,7 @@ io.fabric8.dmp.samples redis-builder-parent - 1.0.5 + 1.1.0 helper-image diff --git a/j2cli-builder-image/pom.xml b/j2cli-builder-image/pom.xml index cf05883..6a020a3 100644 --- a/j2cli-builder-image/pom.xml +++ b/j2cli-builder-image/pom.xml @@ -5,7 +5,7 @@ io.fabric8.dmp.samples redis-builder-parent - 1.0.5 + 1.1.0 j2cli-builder-image diff --git a/j2cli-dist/pom.xml b/j2cli-dist/pom.xml index bf58002..3910091 100644 --- a/j2cli-dist/pom.xml +++ b/j2cli-dist/pom.xml @@ -5,7 +5,7 @@ io.fabric8.dmp.samples redis-builder-parent - 1.0.5 + 1.1.0 j2cli-dist diff --git a/j2cli-image/pom.xml b/j2cli-image/pom.xml index 508c504..3e404c1 100644 --- a/j2cli-image/pom.xml +++ b/j2cli-image/pom.xml @@ -5,7 +5,7 @@ io.fabric8.dmp.samples redis-builder-parent - 1.0.5 + 1.1.0 j2cli-image diff --git a/pom.xml b/pom.xml index b4fb9c1..541169d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.fabric8.dmp.samples redis-builder-parent - 1.0.5 + 1.1.0 pom @@ -33,8 +33,8 @@ 1.8 true none - 6.0.9 - 2819b6d9c56be1f25cd157b9cb6b7c2733edcb46f4f6bcb1b79cefe639a2853b + 6.2.1 + 40a9139fd84b1a3956a2b501aa74261dfa1834420f83e68dd0e40ad5bd5974da 1.31.0 51fcb60efbdf3e579550e9ab893730df56b33d0cc928a2a6467bd846cdfef7d8 0.2.3 @@ -57,7 +57,7 @@ 3.1.2 3.3.0 1.6.0 - 0.33.0 + 0.35.0 diff --git a/redis-builder-image/pom.xml b/redis-builder-image/pom.xml index c43e8ac..ff60374 100644 --- a/redis-builder-image/pom.xml +++ b/redis-builder-image/pom.xml @@ -5,7 +5,7 @@ io.fabric8.dmp.samples redis-builder-parent - 1.0.5 + 1.1.0 redis-builder-image diff --git a/redis-dist/pom.xml b/redis-dist/pom.xml index c884b1f..1533775 100644 --- a/redis-dist/pom.xml +++ b/redis-dist/pom.xml @@ -5,7 +5,7 @@ io.fabric8.dmp.samples redis-builder-parent - 1.0.5 + 1.1.0 redis-dist diff --git a/redis-image/pom.xml b/redis-image/pom.xml index c340a44..70f61f9 100644 --- a/redis-image/pom.xml +++ b/redis-image/pom.xml @@ -5,7 +5,7 @@ io.fabric8.dmp.samples redis-builder-parent - 1.0.5 + 1.1.0 redis-image diff --git a/redis-init-image/pom.xml b/redis-init-image/pom.xml index 6f1d9d0..1e1a3e4 100644 --- a/redis-init-image/pom.xml +++ b/redis-init-image/pom.xml @@ -5,7 +5,7 @@ io.fabric8.dmp.samples redis-builder-parent - 1.0.5 + 1.1.0 redis-init-image