Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to revision 0-SNAPSHOT #1551

Merged
merged 1 commit into from
Jan 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hawkbit-runtime/docker/docker_build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion hawkbit-runtime/docker/docker_build/Dockerfile-mysql
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion hawkbit-runtime/docker/docker_build/Dockerfile_dev
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion hawkbit-runtime/docker/docker_build/Dockerfile_dev-mysql
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
22 changes: 11 additions & 11 deletions hawkbit-runtime/docker/docker_build/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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_
Note that here you have to use your maven repository containing the hawkBit app as docker build context, in the example case _~/.m2/repository_
2 changes: 1 addition & 1 deletion hawkbit-runtime/docker/docker_build/build_all_dev.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ set -xe
# -f <flavour> to pass flavour. "mysql" stands for MySQL while all the rest (and default) is assumed Standard
# -r <local maven repository> 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

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@
</pluginRepositories>

<properties>
<revision>0.5.0-SNAPSHOT</revision>
<revision>0-SNAPSHOT</revision>

<dash.skip>true</dash.skip>
<dash.fail>true</dash.fail>
Expand Down