diff --git a/README.md b/README.md index 98556d986..b835a89b0 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Eclipse [hawkBit](http://www.eclipse.org/hawkbit/index.html) is an domain indepe Build: [![Circle CI](https://circleci.com/gh/eclipse/hawkbit.svg?style=shield)](https://circleci.com/gh/eclipse/hawkbit) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.eclipse.hawkbit/hawkbit-parent/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.eclipse.hawkbit/hawkbit-parent) -Docker images: [![Docker](https://images.microbadger.com/badges/version/hawkbit/hawkbit-update-server:0.2.1.svg)](https://hub.docker.com/r/hawkbit/hawkbit-update-server) [![Docker MYSQL](https://images.microbadger.com/badges/version/hawkbit/hawkbit-update-server:0.2.1-mysql.svg)](https://hub.docker.com/r/hawkbit/hawkbit-update-server) +Docker images: [![Docker](https://images.microbadger.com/badges/version/hawkbit/hawkbit-update-server:0.2.2.svg)](https://hub.docker.com/r/hawkbit/hawkbit-update-server) [![Docker MYSQL](https://images.microbadger.com/badges/version/hawkbit/hawkbit-update-server:0.2.2-mysql.svg)](https://hub.docker.com/r/hawkbit/hawkbit-update-server) # Documentation @@ -27,7 +27,7 @@ Next to the hawkBit core hosted here the project maintains as well [examples](ht We offer a sandbox installation that is free for everyone to try out hawkBit. However, keep in mind that the sandbox database will be reset from time to time. It is also not possible to upload any artifacts into the sandbox. But you can use it to try out the Management UI, Management API and DDI API. Keep in mind as well that you are not permitted to store any kind of personal data in the sandbox. -_NOTE: The sandbox is currently unavailable. We will be back soon!_ +[https://hawkbit.eclipse.org](https://hawkbit.eclipse.org) In addition the following vendors offer free trial accounts for their hawkBit compatible products: diff --git a/deployHawkBitSandbox.sh b/deployHawkBitSandbox.sh deleted file mode 100644 index 9b965e797..000000000 --- a/deployHawkBitSandbox.sh +++ /dev/null @@ -1,23 +0,0 @@ -# -# Copyright (c) 2015 Bosch Software Innovations GmbH and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# - -# This script allows the deployment of the complete hawkBit sandbox including -# data example to a cloud foundry enviroment. Expects existing CF CLI -# installation and login to be existing already. - -cf api https://api.eu-gb.bluemix.net -cf login -cf stop hawkbit-simulator -cd hawkbit-runtime/hawkbit-update-server/target/ -cf push -cd ../../../../hawkbit-examples/ -java -jar hawkbit-example-mgmt-simulator/target/hawkbit-example-mgmt-simulator-0.3.0-SNAPSHOT-exec.jar --hawkbit.url=https://hawkbit-demo-sandbox.eu-gb.mybluemix.net --hawkbit.username=demo --hawkbit.password=demo -cd hawkbit-device-simulator/target/ -cf push -cd ../../.. diff --git a/docs/content/gettingstarted.md b/docs/content/gettingstarted.md index ec215cd48..a4d835878 100755 --- a/docs/content/gettingstarted.md +++ b/docs/content/gettingstarted.md @@ -6,10 +6,12 @@ weight: 20 ## On Sandbox We offer a sandbox installation that is free for everyone to try out hawkBit's [Management UI](/hawkbit/ui/), -[Management API](/hawkbit/apis/management_api/), and [Direct Device Integration API](/hawkbit/apis/ddi_api/). +[Management API](/hawkbit/apis/management_api/), and [Direct Device Integration API](/hawkbit/apis/ddi_api/):   +**[  https://hawkbit.eclipse.org](https://hawkbit.eclipse.org)** {{% warning %}} -The hawkBit sandbox is currently unavailable. [More infos ...](/hawkbit/sandbox/sandboxunavailable/) +The sandbox is a shared installation that will be reset from time to time. Therefore, it is not allowed to upload +any personal data. {{% /warning %}} In addition, the following vendors offer free trial accounts for their Eclipse hawkBit compatible products: @@ -19,22 +21,43 @@ In addition, the following vendors offer free trial accounts for their Eclipse h ## From Docker Image -### Update server only +### Overview -```sh -$ docker run -d -p 8080:8080 hawkbit/hawkbit-update-server +| Service / Container | A | B | C | +|---|---|---|---| +| hawkBit Update Server | ✓ | ✓ | ✓ | +| hawkBit Device Simulator | | | ✓ | +| MySQL | | ✓ | ✓ | +| RabbitMQ | | ✓ | ✓ | + +### A: Run hawkBit Update Server as Docker Container + +Start the hawkBit Update Server as a single container + +```bash +$ docker run -p 8080:8080 hawkbit/hawkbit-update-server:latest ``` -### Updates server + MySql + RabbitMq +### B: Run hawkBit Update Server with services as Docker Compose -```sh +Start the hawkBit Update Server together with an MySQL and RabbitMQ instance as containers + +```bash $ git clone https://github.com/eclipse/hawkbit.git $ cd hawkbit/hawkbit-runtime/hawkbit-update-server/docker $ docker-compose up -d ``` -{{% note %}} -Requires Docker-Compose installed. -{{% /note %}} + +### C: Run hawkBit Update Server with services as Docker Stack + +Start the hawkBit Update Server and Device Simulator together with an MySQL and RabbitMQ instance as services within a swarm + +```bash +$ git clone https://github.com/eclipse/hawkbit.git +$ cd hawkbit/hawkbit-runtime/hawkbit-update-server/docker +$ docker stack init +$ docker stack deploy -c docker-compose-stack.yml hawkbit +``` ## From Sources diff --git a/docs/content/release-notes.md b/docs/content/release-notes.md index 56b152f0b..0d82d66e9 100755 --- a/docs/content/release-notes.md +++ b/docs/content/release-notes.md @@ -3,6 +3,12 @@ title: Release Notes weight: 100 --- +## 0.2.2 + +**Release Date:** Thursday, September 21, 2018
+[Tag](https://github.com/eclipse/hawkbit/releases/tag/0.2.2) / +[Release](https://github.com/eclipse/hawkbit/milestone/10?closed=1) + ## 0.2.1 **Release Date:** Friday, July 6, 2018
diff --git a/docs/content/sandbox.md b/docs/content/sandbox.md new file mode 100644 index 000000000..36c776638 --- /dev/null +++ b/docs/content/sandbox.md @@ -0,0 +1,4 @@ +--- +title: Sandbox +redirectURL: https://hawkbit.eclipse.org +--- \ No newline at end of file diff --git a/docs/content/sandbox/_index.md b/docs/content/sandbox/_index.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/docs/content/sandbox/sandboxunavailable.md b/docs/content/sandbox/sandboxunavailable.md deleted file mode 100644 index 8ef6e6d35..000000000 --- a/docs/content/sandbox/sandboxunavailable.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -title: Sandbox -weight: -201 ---- - -## We are sorry, but the sandbox is currently unavailable - -{{% warning %}} -We are migrating the hawkBit Sandbox to be hosted by the Eclipse Foundation. Therefore, it is currently unavailable. -We will be back soon. -{{% /warning %}} \ No newline at end of file diff --git a/docs/layouts/partials/drawer.html b/docs/layouts/partials/drawer.html index f142b2671..f017e41b1 100755 --- a/docs/layouts/partials/drawer.html +++ b/docs/layouts/partials/drawer.html @@ -21,7 +21,7 @@ {{ if (eq (trim .Site.Params.provider " " | lower) "github") | and (isset .Site.Params "repo_url") }}