From 12ec3eae4d4f86f611aebabf55531fa2bd940bfc Mon Sep 17 00:00:00 2001 From: Avgustin Marinov Date: Thu, 18 Jan 2024 16:37:38 +0200 Subject: [PATCH] Switch to revision 0-SNAPSHOT (#1551) Now there is no necessity to change revision on every relase Note: when release docker images from nexus repo - version shall always be passed Signed-off-by: Marinov Avgustin --- .../docker/docker_build/Dockerfile | 2 +- .../docker/docker_build/Dockerfile-mysql | 2 +- .../docker/docker_build/Dockerfile_dev | 2 +- .../docker/docker_build/Dockerfile_dev-mysql | 2 +- hawkbit-runtime/docker/docker_build/README.md | 22 +++++++++---------- .../docker/docker_build/build_all_dev.sh | 2 +- pom.xml | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/hawkbit-runtime/docker/docker_build/Dockerfile b/hawkbit-runtime/docker/docker_build/Dockerfile index d8c6dfa4e..e0a343f8f 100644 --- a/hawkbit-runtime/docker/docker_build/Dockerfile +++ b/hawkbit-runtime/docker/docker_build/Dockerfile @@ -4,7 +4,7 @@ ARG JAVA_VERSION=17.0.9_9 FROM eclipse-temurin:${JAVA_VERSION}-jre-alpine as build ARG HAWKBIT_APP=hawkbit-update-server -ARG HAWKBIT_VERSION=0.4.1 +ARG HAWKBIT_VERSION=pass_as_buils_arg ENV BUILD_DIR=/opt/hawkbit_build ENV APP=${HAWKBIT_APP} diff --git a/hawkbit-runtime/docker/docker_build/Dockerfile-mysql b/hawkbit-runtime/docker/docker_build/Dockerfile-mysql index 69a78844b..99d5a01dd 100644 --- a/hawkbit-runtime/docker/docker_build/Dockerfile-mysql +++ b/hawkbit-runtime/docker/docker_build/Dockerfile-mysql @@ -4,7 +4,7 @@ ARG JAVA_VERSION=17.0.9_9 FROM eclipse-temurin:${JAVA_VERSION}-jre-alpine as build ARG HAWKBIT_APP=hawkbit-update-server -ARG HAWKBIT_VERSION=0.4.1 +ARG HAWKBIT_VERSION=pass_as_buils_arg ENV BUILD_DIR=/opt/hawkbit_build ENV APP=${HAWKBIT_APP} diff --git a/hawkbit-runtime/docker/docker_build/Dockerfile_dev b/hawkbit-runtime/docker/docker_build/Dockerfile_dev index 0de5e5054..e4d610075 100644 --- a/hawkbit-runtime/docker/docker_build/Dockerfile_dev +++ b/hawkbit-runtime/docker/docker_build/Dockerfile_dev @@ -4,7 +4,7 @@ ARG JAVA_VERSION=17.0.9_9 FROM eclipse-temurin:${JAVA_VERSION}-jre-alpine as build ARG HAWKBIT_APP=hawkbit-update-server -ARG HAWKBIT_VERSION=0.4.1 +ARG HAWKBIT_VERSION=0-SNAPSHOT ENV BUILD_DIR=/opt/hawkbit_build ENV APP=${HAWKBIT_APP} diff --git a/hawkbit-runtime/docker/docker_build/Dockerfile_dev-mysql b/hawkbit-runtime/docker/docker_build/Dockerfile_dev-mysql index abb78bc61..3629b4588 100644 --- a/hawkbit-runtime/docker/docker_build/Dockerfile_dev-mysql +++ b/hawkbit-runtime/docker/docker_build/Dockerfile_dev-mysql @@ -4,7 +4,7 @@ ARG JAVA_VERSION=17.0.9_9 FROM eclipse-temurin:${JAVA_VERSION}-jre-alpine as build ARG HAWKBIT_APP=hawkbit-update-server -ARG HAWKBIT_VERSION=0.4.1 +ARG HAWKBIT_VERSION=0-SNAPSHOT ENV BUILD_DIR=/opt/hawkbit_build ENV APP=${HAWKBIT_APP} diff --git a/hawkbit-runtime/docker/docker_build/README.md b/hawkbit-runtime/docker/docker_build/README.md index df02c8eac..62363ce38 100644 --- a/hawkbit-runtime/docker/docker_build/README.md +++ b/hawkbit-runtime/docker/docker_build/README.md @@ -7,7 +7,7 @@ This directory contains docker files for building both hawkBit docker flavours: Both flavours of are almost the same, just mysql has in addition a MariaDB Java connector and is started, by default, with mysql Spring profile. For every flavour there are two build types: -* _default_ - uses officially released hawkBit versions, downloading them from https://repo1.maven.org +* _release_ - uses officially released hawkBit versions, downloading them from https://repo1.maven.org * _development/dev_ - uses the local maven repository with built by developer (or just downloaded from any maven repository) hawkBit applications ## Build overview @@ -21,35 +21,35 @@ Building images supports the following build arguments (i.e. ARG-s which could b Additionally, tge _development_ builds shall be started with docker build context the local maven repository ## Build standard -Standard flavour could be build, for example, with: +Standard flavour could be build, for example, with (fixed version 0.4.1 is just an example): ```shell -docker build --build-arg HAWKBIT_APP=hawkbit-update-server -t hawkbit_update_server:0.3.0 . -f Dockerfile +docker build --build-arg HAWKBIT_APP=hawkbit-update-server --build-arg HAWKBIT_VERSION=0.4.1 -t hawkbit_update_server:0.4.1 . -f Dockerfile ``` or just by: ```shell -docker build -t hawkbit_update_server:0.3.0 . +docker build --build-arg HAWKBIT_VERSION=0.4.1 -t hawkbit_update_server:0.4.1 . ``` having that docker uses by default _Dockerfile_ and the _hawkbit-update-server_ is the default _HAWKBIT_APP_. -To build development docker images, e.g. snapshot based, you could use something like: +To build standard development docker images, e.g. snapshot based, you could use something like: ```shell -docker build -t hawkbit_update_server:0.4.0-SNAPSHOT -f Dockerfile_dev ~/.m2/repository +docker build -t hawkbit_update_server:0-SNAPSHOT -f Dockerfile_dev ~/.m2/repository ``` Note that here you have to use your maven repository containing the hawkBit app as docker build context, in the example case _~/.m2/repository_ ## Build mysql Mysql flavour could be build, for example, with: ```shell -docker build --build-arg HAWKBIT_APP=hawkbit-update-server -t hawkbit_update_server:0.3.0-mysql . -f Dockerfile-mysql +docker build --build-arg HAWKBIT_APP=hawkbit-update-server --build-arg HAWKBIT_VERSION=0.4.1 -t hawkbit_update_server:0.4.1-mysql . -f Dockerfile-mysql ``` or just by: ```shell -docker build --build-arg -t hawkbit_update_server:0.3.0-mysql . -f Dockerfile-mysql +docker build --build-arg -t hawkbit_update_server:0.4.1-mysql --build-arg HAWKBIT_VERSION=0.4.1 . -f Dockerfile-mysql ``` having that the _hawkbit-update-server_ is the default _HAWKBIT_APP_. -To build development docker images, e.g. snapshot based, you could use something like: +To build development mysql docker images, e.g. snapshot based, you could use something like: ```shell -docker build -t hawkbit_update_server:0.4.0-SNAPSHOT-mysql -f Dockerfile_dev-mysql ~/.m2/repository +docker build -t hawkbit_update_server:0-SNAPSHOT-mysql -f Dockerfile_dev-mysql ~/.m2/repository ``` -Note that here you have to use your maven repository containing the hawkBit app as docker build context, in the example case _~/.m2/repository_ \ No newline at end of file +Note that here you have to use your maven repository containing the hawkBit app as docker build context, in the example case _~/.m2/repository_ \ No newline at end of file diff --git a/hawkbit-runtime/docker/docker_build/build_all_dev.sh b/hawkbit-runtime/docker/docker_build/build_all_dev.sh index c1270b948..4538bab84 100755 --- a/hawkbit-runtime/docker/docker_build/build_all_dev.sh +++ b/hawkbit-runtime/docker/docker_build/build_all_dev.sh @@ -15,7 +15,7 @@ set -xe # -f to pass flavour. "mysql" stands for MySQL while all the rest (and default) is assumed Standard # -r the local maven repository the already built application jars are located into -VERSION=0.4.1 +VERSION=0-SNAPSHOT FLAVOUR="standard" MVN_REPO=~/.m2/repository diff --git a/pom.xml b/pom.xml index 696559daf..57ea702c6 100644 --- a/pom.xml +++ b/pom.xml @@ -144,7 +144,7 @@ - 0.5.0-SNAPSHOT + 0-SNAPSHOT true true