Merge pull request #2 from AStA-HSRM/dev-java-julian

merge deployment files into main dev branch

Author: das-kaesebrot

.gitignore

@@ -208,4 +208,7 @@ docker-persistence/*
 !docker-persistence/.gitkeep
 
 # ignore secret configuration files
-secret.properties
+secret.properties
+
+# Gzipped log file
+*.log.*.gz

Dockerfile

@@ -1,6 +1,31 @@
 FROM openjdk:11-jdk-slim
+
+# Create user and group to run as
 RUN addgroup --system spring && adduser --system --group spring
+
+ARG SPRING_FOLDER=/srv/spring
+
+# Create settings and logs folder
+RUN mkdir -pv ${SPRING_FOLDER}/logs && \
+    mkdir -pv ${SPRING_FOLDER}/config
+
+# Set path for log file
+ENV LOGGING_FILE_NAME=${SPRING_FOLDER}/logs/error.log
+
+# Copy over override.properties file to container (ENV variables take precedence)
+ENV SPRING_CONFIG_IMPORT=optional:file:${SPRING_FOLDER}/config/override.properties
+COPY src/main/resources/application.properties.sample ${SPRING_FOLDER}/config/override.properties
+
+# Set proper perms
+RUN chown -R spring:spring ${SPRING_FOLDER}
+
+# Set run user and group
 USER spring:spring
+
+# Copy over compiled jar
 ARG JAR_FILE=build/libs/gremiomat-0.0.1-SNAPSHOT.jar
 COPY ${JAR_FILE} app.jar
+
+WORKDIR ${SPRING_FOLDER}
+
 ENTRYPOINT ["java","-jar","/app.jar"]

build.gradle

@@ -10,6 +10,14 @@ group = 'de.astahsrm'
 version = '0.0.1-SNAPSHOT'
 sourceCompatibility = '11'
 
+jar {
+    manifest {
+        attributes(
+                'Main-Class': 'de.astahsrm.gremiomat.GremiomatApplication'
+        )
+    }
+}
+
 repositories {
 	mavenCentral()
 }

docker-compose-prod.yml

@@ -1,9 +1,22 @@
 version: "2"
 
-services:
-  tomcat-test:
+services: 
+  spring:
     build: .
     restart: always
-    container_name: tomcat-test
+    environment:
+      # required arguments
+      - SPRING_DATASOURCE_URL=jdbc:mariadb://db:3306/temp_db
+      - SPRING_DATASOURCE_USERNAME=dev
+      - SPRING_DATASOURCE_PASSWORD=dev123
+      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=org.mariadb.jdbc.Driver
+      - SPRING_MAIL_USERNAME=mail@example.com
+      - SPRING_MAIL_PASSWORD=N0tTh3Actu4lP4SSw0rd
+      # optional arguments
+      # - SERVER_PORT=8090
+      # - DEBUG=true
+      # - SPRING_THYMELEAF_CACHE=false
+      # - LOGGING_LEVEL_WEB=DEBUG
+    # network_mode: host
     ports: 
-      - 8080:8080
+      - 8090:8090

src/main/resources/application.properties.prod

@@ -0,0 +1,35 @@
+# Server  config
+# server.port=8090
+# debug=false
+# spring.thymeleaf.cache=false
+
+# logging config for Errors
+# logging.file.name=error.log
+# logging.level.web=DEBUG
+# logging.level.org.springframework.web=debug
+
+# Database config
+# spring.datasource.url=jdbc:mariadb://localhost:3306/temp_db
+# spring.datasource.username=dev
+# spring.datasource.password=dev123
+# spring.datasource.driver-class-name=org.mariadb.jdbc.Driver
+# spring.jpa.hibernate.ddl-auto=create-drop
+# spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MariaDB103Dialect
+
+# For initialising DB with data.sql
+# spring.sql.init.mode=always
+# spring.jpa.defer-datasource-initialization=true
+
+# logging.level.org.springframework.boot.autoconfigure=ERROR
+
+# Mail config
+spring.mail.default-encoding=UTF-8
+spring.mail.host=host.boi
+spring.mail.port=69
+spring.mail.username=boi
+spring.mail.password=b01
+spring.mail.test-connection=false
+spring.mail.properties.mail.smtp.auth=true
+spring.mail.properties.mail.smtp.starttls.enable=true
+
+spring.config.import=optional:file:/srv/spring/config/override.properties

src/main/resources/application.properties.sample

@@ -0,0 +1,35 @@
+# Server  config
+# server.port=8090
+# debug=false
+# spring.thymeleaf.cache=false
+
+# logging config for Errors
+# logging.file.name=error.log
+# logging.level.web=DEBUG
+# logging.level.org.springframework.web=debug
+
+# Database config
+# spring.datasource.url=jdbc:mariadb://localhost:3306/temp_db
+# spring.datasource.username=dev
+# spring.datasource.password=dev123
+# spring.datasource.driver-class-name=org.mariadb.jdbc.Driver
+# spring.jpa.hibernate.ddl-auto=create-drop
+# spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MariaDB103Dialect
+
+# For initialising DB with data.sql
+# spring.sql.init.mode=always
+# spring.jpa.defer-datasource-initialization=true
+
+# logging.level.org.springframework.boot.autoconfigure=ERROR
+
+# Mail config
+# spring.mail.default-encoding=UTF-8
+# spring.mail.host=host.boi
+# spring.mail.port=69
+# spring.mail.username=boi
+# spring.mail.password=b01
+# spring.mail.test-connection=false
+# spring.mail.properties.mail.smtp.auth=true
+# spring.mail.properties.mail.smtp.starttls.enable=true
+
+# spring.config.import=optional:file:/srv/spring/config/override.properties