From 29db5dec15f563b02e2ba9f51c1f373552fa7aa1 Mon Sep 17 00:00:00 2001 From: Dominic Schabel Date: Tue, 15 May 2018 17:36:36 +0200 Subject: [PATCH] Provide new docker containers for 0.2.0M9 Signed-off-by: Dominic Schabel --- .../docker/0.2.0M3/Dockerfile | 26 ------------ .../docker/0.2.0M9-mysql/Dockerfile | 17 ++++++++ .../docker/0.2.0M9-mysql/KEYS | 40 +++++++++++++++++++ .../docker/0.2.0M9/Dockerfile | 25 ++++++++++++ .../docker/{0.2.0M3 => 0.2.0M9}/KEY | 0 .../{0.2.0M4-mysql => }/docker-compose.yml | 38 ++++-------------- 6 files changed, 89 insertions(+), 57 deletions(-) delete mode 100644 hawkbit-runtime/hawkbit-update-server/docker/0.2.0M3/Dockerfile create mode 100644 hawkbit-runtime/hawkbit-update-server/docker/0.2.0M9-mysql/Dockerfile create mode 100644 hawkbit-runtime/hawkbit-update-server/docker/0.2.0M9-mysql/KEYS create mode 100644 hawkbit-runtime/hawkbit-update-server/docker/0.2.0M9/Dockerfile rename hawkbit-runtime/hawkbit-update-server/docker/{0.2.0M3 => 0.2.0M9}/KEY (100%) rename hawkbit-runtime/hawkbit-update-server/docker/{0.2.0M4-mysql => }/docker-compose.yml (56%) diff --git a/hawkbit-runtime/hawkbit-update-server/docker/0.2.0M3/Dockerfile b/hawkbit-runtime/hawkbit-update-server/docker/0.2.0M3/Dockerfile deleted file mode 100644 index c62ab2a86..000000000 --- a/hawkbit-runtime/hawkbit-update-server/docker/0.2.0M3/Dockerfile +++ /dev/null @@ -1,26 +0,0 @@ -FROM openjdk:8u121-jre-alpine - -MAINTAINER Kai Zimmermann - -ENV HAWKBIT_VERSION=0.2.0M3 \ - HAWKBIT_HOME=/opt/hawkbit - -# Http port -EXPOSE 8080 - -COPY KEY . - -RUN set -x \ - && apk add --no-cache gnupg unzip \ - && apk add --no-cache libressl wget \ - && gpg --import KEY \ - && mkdir -p $HAWKBIT_HOME \ - && cd $HAWKBIT_HOME \ - && wget -O hawkbit-update-server.jar --no-verbose http://repo1.maven.org/maven2/org/eclipse/hawkbit/hawkbit-update-server/$HAWKBIT_VERSION/hawkbit-update-server-$HAWKBIT_VERSION.jar \ - && wget -O hawkbit-update-server.jar.asc --no-verbose http://repo1.maven.org/maven2/org/eclipse/hawkbit/hawkbit-update-server/$HAWKBIT_VERSION/hawkbit-update-server-$HAWKBIT_VERSION.jar.asc \ - && gpg --batch --verify hawkbit-update-server.jar.asc hawkbit-update-server.jar - -VOLUME "$HAWKBIT_HOME/data" - -WORKDIR $HAWKBIT_HOME -ENTRYPOINT ["java","-jar","hawkbit-update-server.jar","-Xmx768m -Xmx768m -XX:MaxMetaspaceSize=250m -XX:MetaspaceSize=250m -Xss300K -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError"] diff --git a/hawkbit-runtime/hawkbit-update-server/docker/0.2.0M9-mysql/Dockerfile b/hawkbit-runtime/hawkbit-update-server/docker/0.2.0M9-mysql/Dockerfile new file mode 100644 index 000000000..26c3ab14a --- /dev/null +++ b/hawkbit-runtime/hawkbit-update-server/docker/0.2.0M9-mysql/Dockerfile @@ -0,0 +1,17 @@ +FROM hawkbit/hawkbit-update-server:0.2.0M9 + +MAINTAINER Kai Zimmermann + +ENV MARIADB_DRIVER_VERSION=2.2.4 + +COPY KEYS . + +RUN set -x \ + && apk add --no-cache --virtual build-dependencies gnupg unzip libressl wget \ + && gpg --import KEYS \ + && wget -O $JAVA_HOME/lib/ext/mariadb-java-client.jar --no-verbose http://downloads.mariadb.com/Connectors/java/connector-java-$MARIADB_DRIVER_VERSION/mariadb-java-client-$MARIADB_DRIVER_VERSION.jar \ + && wget -O $JAVA_HOME/lib/ext/mariadb-java-client.jar.asc --no-verbose http://downloads.mariadb.com/Connectors/java/connector-java-$MARIADB_DRIVER_VERSION/mariadb-java-client-$MARIADB_DRIVER_VERSION.jar.asc \ + && gpg --verify --batch $JAVA_HOME/lib/ext/mariadb-java-client.jar.asc $JAVA_HOME/lib/ext/mariadb-java-client.jar \ + && apk del build-dependencies + +ENTRYPOINT ["java","-jar","hawkbit-update-server.jar","--spring.profiles.active=mysql","-Xmx768m -Xmx768m -XX:MaxMetaspaceSize=250m -XX:MetaspaceSize=250m -Xss300K -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError"] diff --git a/hawkbit-runtime/hawkbit-update-server/docker/0.2.0M9-mysql/KEYS b/hawkbit-runtime/hawkbit-update-server/docker/0.2.0M9-mysql/KEYS new file mode 100644 index 000000000..4c602ae04 --- /dev/null +++ b/hawkbit-runtime/hawkbit-update-server/docker/0.2.0M9-mysql/KEYS @@ -0,0 +1,40 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: SKS 1.1.6 +Comment: Hostname: pgp.mit.edu + +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 +FsnHsQksxFhCqGYdUKyfRsobs/Ns +=ovQp +-----END PGP PUBLIC KEY BLOCK----- diff --git a/hawkbit-runtime/hawkbit-update-server/docker/0.2.0M9/Dockerfile b/hawkbit-runtime/hawkbit-update-server/docker/0.2.0M9/Dockerfile new file mode 100644 index 000000000..032702520 --- /dev/null +++ b/hawkbit-runtime/hawkbit-update-server/docker/0.2.0M9/Dockerfile @@ -0,0 +1,25 @@ +FROM openjdk:8u151-jre-alpine + +MAINTAINER Kai Zimmermann + +ENV HAWKBIT_VERSION=0.2.0M9 \ + HAWKBIT_HOME=/opt/hawkbit + +EXPOSE 8080 + +COPY KEY . + +RUN set -x \ + && apk add --no-cache --virtual build-dependencies gnupg unzip libressl wget \ + && gpg --import KEY \ + && mkdir -p $HAWKBIT_HOME \ + && cd $HAWKBIT_HOME \ + && wget -O hawkbit-update-server.jar --no-verbose https://repo1.maven.org/maven2/org/eclipse/hawkbit/hawkbit-update-server/$HAWKBIT_VERSION/hawkbit-update-server-$HAWKBIT_VERSION.jar \ + && wget -O hawkbit-update-server.jar.asc --no-verbose https://repo1.maven.org/maven2/org/eclipse/hawkbit/hawkbit-update-server/$HAWKBIT_VERSION/hawkbit-update-server-$HAWKBIT_VERSION.jar.asc \ + && gpg --batch --verify hawkbit-update-server.jar.asc hawkbit-update-server.jar \ + && apk del build-dependencies + +VOLUME "$HAWKBIT_HOME/data" + +WORKDIR $HAWKBIT_HOME +ENTRYPOINT ["java","-jar","hawkbit-update-server.jar","-Xmx768m -Xmx768m -XX:MaxMetaspaceSize=250m -XX:MetaspaceSize=250m -Xss300K -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError"] diff --git a/hawkbit-runtime/hawkbit-update-server/docker/0.2.0M3/KEY b/hawkbit-runtime/hawkbit-update-server/docker/0.2.0M9/KEY similarity index 100% rename from hawkbit-runtime/hawkbit-update-server/docker/0.2.0M3/KEY rename to hawkbit-runtime/hawkbit-update-server/docker/0.2.0M9/KEY diff --git a/hawkbit-runtime/hawkbit-update-server/docker/0.2.0M4-mysql/docker-compose.yml b/hawkbit-runtime/hawkbit-update-server/docker/docker-compose.yml similarity index 56% rename from hawkbit-runtime/hawkbit-update-server/docker/0.2.0M4-mysql/docker-compose.yml rename to hawkbit-runtime/hawkbit-update-server/docker/docker-compose.yml index b9c959e68..b2e1224af 100644 --- a/hawkbit-runtime/hawkbit-update-server/docker/0.2.0M4-mysql/docker-compose.yml +++ b/hawkbit-runtime/hawkbit-update-server/docker/docker-compose.yml @@ -1,13 +1,12 @@ -version: '2' +version: '3' services: # --------------------- - # The rabbitMQ service + # RabbitMQ service # --------------------- rabbitmq: image: "rabbitmq:3-management" - hostname: "rabbitmq" environment: RABBITMQ_DEFAULT_VHOST: "/" restart: always @@ -16,13 +15,12 @@ services: - "5672:5672" labels: NAME: "rabbitmq" - + # --------------------- - # The mysql service + # MySQL service # --------------------- mysql: image: "mysql:5.7" - hostname: "mysql" environment: MYSQL_DATABASE: "hawkbit" MYSQL_USER: "root" @@ -32,16 +30,12 @@ services: - "3306:3306" labels: NAME: "mysql" - + # --------------------- - # The hawkbit service + # HawkBit service # --------------------- hawkbit: - image: "hawkbit/hawkbit-update-server:0.2.0M4-mysql" - hostname: "hawkbit" - links: - - mysql - - rabbitmq + image: "hawkbit/hawkbit-update-server:0.2.0M9-mysql" environment: - 'SPRING_DATASOURCE_URL=jdbc:mysql://mysql:3306/hawkbit' - 'SPRING_RABBITMQ_HOST=rabbitmq' @@ -53,21 +47,3 @@ services: - "8080:8080" labels: NAME: "hawkbit" - - # --------------------- - # The hawkbit-simulator service - # --------------------- - hawkbit-simulator: - image: "hawkbit/hawkbit-device-simulator:latest" - hostname: "hawkbit-device-simulator" - links: - - hawkbit - - rabbitmq - environment: - - 'SPRING_RABBITMQ_HOST=rabbitmq' - - 'SERVER_SESSION_COOKIE_NAME=hawkbitsimu' - restart: always - ports: - - "8083:8083" - labels: - NAME: "hawkbit-device-simulator" \ No newline at end of file