From dad4487fddaccf44240f5d62fa83830f7bbf8a5d Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Tue, 24 Oct 2017 12:07:09 +0200 Subject: bug(#6): Improve Docker deployment This change improves the Docker deployment by moving the build process from runtime to (image) build time. Also, the opendc-integration-jpa module now consists of a core and mysql module, where the mysql module is a specific deployment of the integration. --- opendc-integration-jpa/mysql/Dockerfile | 30 ++++++++++++++++ opendc-integration-jpa/mysql/build.gradle | 38 ++++++++++++++++++++ .../src/main/resources/META-INF/persistence.xml | 41 ++++++++++++++++++++++ 3 files changed, 109 insertions(+) create mode 100644 opendc-integration-jpa/mysql/Dockerfile create mode 100644 opendc-integration-jpa/mysql/build.gradle create mode 100644 opendc-integration-jpa/mysql/src/main/resources/META-INF/persistence.xml (limited to 'opendc-integration-jpa/mysql') diff --git a/opendc-integration-jpa/mysql/Dockerfile b/opendc-integration-jpa/mysql/Dockerfile new file mode 100644 index 00000000..75e419b4 --- /dev/null +++ b/opendc-integration-jpa/mysql/Dockerfile @@ -0,0 +1,30 @@ +# Docker mysql image for the OpenDC simulator project +# This image requires the context to be set to the root directory of the project in order to correctly build. +FROM gradle:alpine +MAINTAINER Fabian Mastenbroek + +# Set the home directory to our gradle user's home. +ENV HOME=/home/gradle +ENV APP_HOME=$HOME/simulator + +# Copy OpenDC simulator +COPY ./ $APP_HOME + +# Build as root +USER root + +# Set the working directory to the simulator +WORKDIR $APP_HOME + +# Build the application +RUN gradle --no-daemon :opendc-integration-jpa:mysql:installDist + +# Fix permissions +RUN chown -R gradle:gradle $APP_HOME + +# Downgrade user +USER gradle + +# Start the Gradle application on run +CMD opendc-integration-jpa/mysql/build/install/mysql/bin/mysql + diff --git a/opendc-integration-jpa/mysql/build.gradle b/opendc-integration-jpa/mysql/build.gradle new file mode 100644 index 00000000..c1cc6f58 --- /dev/null +++ b/opendc-integration-jpa/mysql/build.gradle @@ -0,0 +1,38 @@ +/* + * MIT License + * + * Copyright (c) 2017 atlarge-research + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +apply plugin: 'java' +apply plugin: 'application' +mainClassName = "nl.atlarge.opendc.platform.JpaPlatformRunnerKt" + +repositories { + jcenter() +} + +dependencies { + compile project(':opendc-integration-jpa:core') + runtime 'org.slf4j:slf4j-simple:1.7.25' + runtime 'org.hibernate:hibernate-core:5.2.5.Final' + runtime 'mysql:mysql-connector-java:5.1.13' +} diff --git a/opendc-integration-jpa/mysql/src/main/resources/META-INF/persistence.xml b/opendc-integration-jpa/mysql/src/main/resources/META-INF/persistence.xml new file mode 100644 index 00000000..0e40dc6e --- /dev/null +++ b/opendc-integration-jpa/mysql/src/main/resources/META-INF/persistence.xml @@ -0,0 +1,41 @@ + + + + + + org.hibernate.jpa.HibernatePersistenceProvider + jpa/schema.xml + + + + + + + + + -- cgit v1.2.3