fix deployment for “unstable”

peh · Mar 27, 2017 · 65d347e · 65d347e
1 parent 9ee1d0b
commit 65d347e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/docker-compose.unstable.yml b/docker-compose.unstable.yml
@@ -2,10 +2,10 @@ version: '2'
 services:
   app:
     container_name: errbuddy-app
-    hostname: ${HOSTNAME}
     env_file: .env
-    mem_limit: 3g
-    image: gradle:3.4-jdk8-alpine
+    mem_limit: 4g
+    hostname: ${HOSTNAME}
+    image: openjdk:8-jdk
     ports:
     - 9000:9000
     depends_on:
@@ -18,10 +18,7 @@ services:
      - redis
      - elasticsearch
     volumes:
-      - .:/opt/app
+      - ./start-latest-stable.sh:/opt/start-latest-stable.sh
       - ./default-config.groovy:/opt/errbuddy/errbuddy.groovy
-      - .data/.gradle:/root/.gradle:rw
-      - .data/build:/opt/app/build:rw
-      - .data/nodejs:/opt/app/.nodejs:rw
-      - .data/node_moudels:/opt/app/node_modules:rw
-    command: /bin/bash -c "cd /opt/app/ && gradle bootRun -Dgrails.env=prod -Derrbuddy.mysql.password=${MYSQL_PASSWORD} -Derrbuddy.serverUrl=${SERVER_URL}"
+      #TODO: find out how to have a seperate volume for scaled servers
+    command: /bin/bash -c "bash /opt/start-latest.sh"
diff --git a/grails-app/services/errbuddy/EntryCleanupService.groovy b/grails-app/services/errbuddy/EntryCleanupService.groovy
@@ -9,7 +9,7 @@ class EntryCleanupService {
 
 	void handleEntryCleanupForApplication(App app) {
 		int max = 500
-		def entries = Entry.createCriteria().list([max: max]) {
+		def entries = Entry.createCriteria().list([max: max, order: 'asc', sort: 'id']) {
 			entryGroup {
 				eq('app', app)
 			}

diff --git a/start-latest.sh b/start-latest.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+TARGET=/opt/errbuddy.war
+LATEST_RELEASE=$(curl -L -s -H 'Accept: application/json' https://github.com/peh/errbuddy/releases/latest)
+LATEST_VERSION=$(echo $LATEST_RELEASE | sed -e 's/.*"tag_name":"\([^"]*\)".*/\1/')
+ARTIFACT_URL="https://github.com/peh/errbuddy/releases/download/$LATEST_VERSION/errbuddy.war"
+
+rm -f $TARGET
+wget -O $TARGET $ARTIFACT_URL
+java -Dgrails.env=prod -Derrbuddy.mysql.password=$MYSQL_PASSWORD -Derrbuddy.serverUrl=$SERVER_URL -jar $TARGET