From 9b0594922b270fa0715f8ba608b61ac79eb5d8ee Mon Sep 17 00:00:00 2001 From: Widad LHANFOURI Date: Fri, 5 Oct 2018 10:28:46 +0200 Subject: [PATCH 01/20] added gitignore --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..41390ae --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +## This is the kind of files that we want to ignore +bin +target +*.class +*.jar From 34ecf207391d2f80b569ca7a84f740d7473d1a59 Mon Sep 17 00:00:00 2001 From: Rintarou Date: Fri, 5 Oct 2018 10:26:00 +0200 Subject: [PATCH 02/20] CREATED README --- README.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..86d4972 --- /dev/null +++ b/README.md @@ -0,0 +1,4 @@ +### ALMA server + +This repository will contain the source code of the ALMA server based on Spring Boot. + From 8676f907a1199a2a046b4529f18c2d2ee3612001 Mon Sep 17 00:00:00 2001 From: Slaanaroth Date: Fri, 5 Oct 2018 10:21:11 +0200 Subject: [PATCH 03/20] Added Java application file --- .../java/fr/univnantes/alma/server/Application.java | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 alma-server/src/main/java/fr/univnantes/alma/server/Application.java diff --git a/alma-server/src/main/java/fr/univnantes/alma/server/Application.java b/alma-server/src/main/java/fr/univnantes/alma/server/Application.java new file mode 100644 index 0000000..f2e8740 --- /dev/null +++ b/alma-server/src/main/java/fr/univnantes/alma/server/Application.java @@ -0,0 +1,11 @@ +package fr.univnantes.alma.server; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class Application { + public static void main(String[] args) { + SpringApplication.run(Application.class, args); + } +} From 3a616df268b62f50481cc2b64544b87c838fb140 Mon Sep 17 00:00:00 2001 From: Slaanaroth Date: Fri, 5 Oct 2018 11:34:45 +0200 Subject: [PATCH 04/20] Added Maven pom file --- alma-server/pom.xml | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 alma-server/pom.xml diff --git a/alma-server/pom.xml b/alma-server/pom.xml new file mode 100644 index 0000000..3e6fd39 --- /dev/null +++ b/alma-server/pom.xml @@ -0,0 +1,38 @@ + + + 4.0.0 + + fr.univnantes + alma-server + 0.1.0 + + + org.springframework.boot + spring-boot-starter-parent + 1.4.2.RELEASE + + + + + org.springframework.boot + spring-boot-starter-web + + + + + 1.8 + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + From f9d05cc9c02e6897d54ac72f01cabb4193820e0b Mon Sep 17 00:00:00 2001 From: Slaanaroth Date: Fri, 5 Oct 2018 11:37:47 +0200 Subject: [PATCH 05/20] Fixed version error in pom --- alma-server/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alma-server/pom.xml b/alma-server/pom.xml index 3e6fd39..96d77a6 100644 --- a/alma-server/pom.xml +++ b/alma-server/pom.xml @@ -6,7 +6,7 @@ fr.univnantes alma-server - 0.1.0 + 1.0.0 org.springframework.boot From e6a073b0b070202fc4c121bc2682119888bbd7f6 Mon Sep 17 00:00:00 2001 From: Widad LHANFOURI Date: Fri, 5 Oct 2018 11:47:28 +0200 Subject: [PATCH 06/20] add dockerfile --- alma-server/src/main/docker/Dockerfile | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 alma-server/src/main/docker/Dockerfile diff --git a/alma-server/src/main/docker/Dockerfile b/alma-server/src/main/docker/Dockerfile new file mode 100644 index 0000000..dfd21a0 --- /dev/null +++ b/alma-server/src/main/docker/Dockerfile @@ -0,0 +1,5 @@ +FROM frolvlad/alpine-oraclejdk8:slim +VOLUME /tmp +ADD alma-server-0.1.0-SNAPSHOT.jar app.jar +RUN sh -c 'touch /app.jar' +ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Dspring.profiles.active=container","-jar","/app.jar"] From 518de9b354492ce8e14c2df77128e88d0cfe8496 Mon Sep 17 00:00:00 2001 From: Rintarou Date: Fri, 5 Oct 2018 11:50:17 +0200 Subject: [PATCH 07/20] TRAVIS SUPPORT CONFIG FILE --- .travis.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..093419b --- /dev/null +++ b/.travis.yml @@ -0,0 +1,7 @@ +language: java +jdk: oraclejdk8 + +script: + - cd alma-server/ + - mvn clean verify -e + From 291aa08afb149b6a7f909c33223b6c814db557a1 Mon Sep 17 00:00:00 2001 From: Rintarou Date: Fri, 5 Oct 2018 11:58:04 +0200 Subject: [PATCH 08/20] (corrected) TRAVIS SUPPORT --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 093419b..989c480 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,5 @@ language: java jdk: oraclejdk8 script: - - cd alma-server/ - - mvn clean verify -e + - mvn clean verify -f alma-server/pom.xml -e From 1d9f4d541476a14271eb54a40201e890aaa9bf9c Mon Sep 17 00:00:00 2001 From: Widad LHANFOURI Date: Fri, 5 Oct 2018 12:01:39 +0200 Subject: [PATCH 09/20] corrected dockerfile --- alma-server/src/main/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alma-server/src/main/docker/Dockerfile b/alma-server/src/main/docker/Dockerfile index dfd21a0..3fab1b4 100644 --- a/alma-server/src/main/docker/Dockerfile +++ b/alma-server/src/main/docker/Dockerfile @@ -1,5 +1,5 @@ FROM frolvlad/alpine-oraclejdk8:slim VOLUME /tmp -ADD alma-server-0.1.0-SNAPSHOT.jar app.jar +ADD alma-server-1.0.0-SNAPSHOT.jar app.jar RUN sh -c 'touch /app.jar' ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Dspring.profiles.active=container","-jar","/app.jar"] From f7d160a4feb0d7b427b54da2d8697fc98b9e36ed Mon Sep 17 00:00:00 2001 From: Slaanaroth Date: Fri, 9 Nov 2018 14:28:08 +0100 Subject: [PATCH 10/20] Added docker build for continuous integration --- .travis.yml | 13 ++++++++++++- alma-server/pom.xml | 43 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 54 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 989c480..4b6f035 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,17 @@ +sudo: required +services: + - docker + language: java jdk: oraclejdk8 +branches: + only: + - master + +before_install: + - docker version + - docker info + script: - mvn clean verify -f alma-server/pom.xml -e - diff --git a/alma-server/pom.xml b/alma-server/pom.xml index 96d77a6..0562b5e 100644 --- a/alma-server/pom.xml +++ b/alma-server/pom.xml @@ -6,7 +6,7 @@ fr.univnantes alma-server - 1.0.0 + 1.0.0-SNAPSHOT org.springframework.boot @@ -23,6 +23,7 @@ 1.8 + labrasse @@ -32,6 +33,46 @@ org.springframework.boot spring-boot-maven-plugin + + com.spotify + docker-maven-plugin + 0.4.11 + + + build-image + package + + build + + + + tag-image + package + + tag + + + labrasse/alma-server:${project.version} + hub.docker.com/labrasse/alma-server:${project.version} + + + + + ${docker.image.prefix}/${project.artifactId} + ${project.basedir}/src/main/docker + + ${project.version} + latest + + + + / + ${project.build.directory} + ${project.build.finalName}.jar + + + + From a783099e59e64fcd5e0a27deed52b96a799551d1 Mon Sep 17 00:00:00 2001 From: Widad LHANFOURI Date: Fri, 9 Nov 2018 14:44:03 +0100 Subject: [PATCH 11/20] Continuous release --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index 4b6f035..bede313 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,3 +15,8 @@ before_install: script: - mvn clean verify -f alma-server/pom.xml -e + +after_success: + - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASSWORD + - docker images + - docker push labrasse/alma-server:latest From 3f19a1fd6c986f9da432297539e6b24df4644200 Mon Sep 17 00:00:00 2001 From: Rintarou Date: Fri, 9 Nov 2018 14:47:44 +0100 Subject: [PATCH 12/20] here comes the first controller --- .../alma/server/controllers/HelloController.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 alma-server/src/main/java/fr/univnantes/alma/server/controllers/HelloController.java diff --git a/alma-server/src/main/java/fr/univnantes/alma/server/controllers/HelloController.java b/alma-server/src/main/java/fr/univnantes/alma/server/controllers/HelloController.java new file mode 100644 index 0000000..c030b09 --- /dev/null +++ b/alma-server/src/main/java/fr/univnantes/alma/server/controllers/HelloController.java @@ -0,0 +1,14 @@ +package fr.univnantes.alma.server.controllers; + +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.RequestMapping; + +@RestController +public class HelloController { + + @RequestMapping("/") + public String index() { + return "Greetings from Spring Boot!"; + } + +} From a3fe4b33967d64164a1f65070f37fed1abe8a16b Mon Sep 17 00:00:00 2001 From: Rintarou Date: Fri, 9 Nov 2018 15:00:58 +0100 Subject: [PATCH 13/20] adding unit tests --- alma-server/pom.xml | 5 +++ .../server/tests/HelloControllerTest.java | 31 +++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 alma-server/src/test/java/fr/univnantes/alma/server/tests/HelloControllerTest.java diff --git a/alma-server/pom.xml b/alma-server/pom.xml index 0562b5e..cf31986 100644 --- a/alma-server/pom.xml +++ b/alma-server/pom.xml @@ -19,6 +19,11 @@ org.springframework.boot spring-boot-starter-web + + org.springframework.boot + spring-boot-starter-test + test + diff --git a/alma-server/src/test/java/fr/univnantes/alma/server/tests/HelloControllerTest.java b/alma-server/src/test/java/fr/univnantes/alma/server/tests/HelloControllerTest.java new file mode 100644 index 0000000..b1b8f5a --- /dev/null +++ b/alma-server/src/test/java/fr/univnantes/alma/server/tests/HelloControllerTest.java @@ -0,0 +1,31 @@ +package fr.univnantes.alma.server.tests; + +import static org.hamcrest.Matchers.equalTo; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.http.MediaType; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; + +@RunWith(SpringRunner.class) +@SpringBootTest +@AutoConfigureMockMvc +public class HelloControllerTest { + + @Autowired + private MockMvc mvc; + + @Test + public void getHello() throws Exception { + mvc.perform(MockMvcRequestBuilders.get("/").accept(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk()) + .andExpect(content().string(equalTo("Greetings from Spring Boot!"))); + } +} From efb4f6e78439f7106a382480e809e1f611221913 Mon Sep 17 00:00:00 2001 From: Widad LHANFOURI Date: Fri, 9 Nov 2018 15:15:04 +0100 Subject: [PATCH 14/20] Front end ressources added --- alma-server/src/main/resources/static/index.html | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 alma-server/src/main/resources/static/index.html diff --git a/alma-server/src/main/resources/static/index.html b/alma-server/src/main/resources/static/index.html new file mode 100644 index 0000000..26aff03 --- /dev/null +++ b/alma-server/src/main/resources/static/index.html @@ -0,0 +1,16 @@ + + + +Static Resource + + + + +
+

Home

+

Some static content

+
+ + + + From be314353626d38bdf0df533e7aab1dec97aa56d8 Mon Sep 17 00:00:00 2001 From: Slaanaroth Date: Fri, 9 Nov 2018 15:28:43 +0100 Subject: [PATCH 15/20] Front end ressources build --- alma-server/src/main/resources/.jshintrc | 21 ++++++++ alma-server/src/main/resources/gulpfile.js | 48 +++++++++++++++++++ alma-server/src/main/resources/package.json | 38 +++++++++++++++ .../resources/static/folder/greatFunction.js | 16 +++++++ alma-server/src/main/resources/static/main.js | 13 +++++ 5 files changed, 136 insertions(+) create mode 100644 alma-server/src/main/resources/.jshintrc create mode 100644 alma-server/src/main/resources/gulpfile.js create mode 100644 alma-server/src/main/resources/package.json create mode 100644 alma-server/src/main/resources/static/folder/greatFunction.js create mode 100644 alma-server/src/main/resources/static/main.js diff --git a/alma-server/src/main/resources/.jshintrc b/alma-server/src/main/resources/.jshintrc new file mode 100644 index 0000000..e3a7f93 --- /dev/null +++ b/alma-server/src/main/resources/.jshintrc @@ -0,0 +1,21 @@ +{ + "esversion": 6, + "node": true, + "browser": true, + "bitwise": true, + "camelcase": true, + "curly": true, + "eqeqeq": true, + "immed": true, + "indent": 2, + "latedef": true, + "newcap": true, + "noarg": true, + "quotmark": "single", + "regexp": true, + "undef": true, + "unused": true, + "strict": true, + "trailing": true, + "smarttabs": true +} diff --git a/alma-server/src/main/resources/gulpfile.js b/alma-server/src/main/resources/gulpfile.js new file mode 100644 index 0000000..3eadcb6 --- /dev/null +++ b/alma-server/src/main/resources/gulpfile.js @@ -0,0 +1,48 @@ +/******************************************************************************* + * Copyright (c) 2016 . + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the MIT License which + * accompanies this distribution, and is available at + * https://opensource.org/licenses/MIT + *******************************************************************************/ + +'use strict'; + +let gulp = require('gulp'), + browserify = require('gulp-browserify'), + gulpUtil = require('gulp-util'); + +var $ = require('gulp-load-plugins')(); + +gulp.task('clean', () => { + return gulp.src([ + 'static/main.min.js', + 'static/main.browserify.js', + 'checkstyle.xml' + ]).pipe($.clean()); +}); + +gulp.task('scripts', ['clean'], () => { + return gulp.src( + [ + 'static/**/*.js' + ]) + .pipe($.jshint()) + .pipe($.jshint.reporter(require('jshint-stylish'))) + .pipe($.jshint.reporter(require('jshint-checkstyle-file-reporter'))) + .pipe($.size()); +}); + +gulp.task('browserify', ['scripts'], () => { + return gulp.src(['static/main.js']) + .pipe(browserify({insertGlobals: true})) + .pipe($.concat('main.browserify.js')) + .pipe(gulp.dest('static/')); +}); + +gulp.task('minify', ['browserify'], () => { + return gulp.src(['static/main.browserify.js']) + .pipe($.uglify().on('error', gulpUtil.log)) + .pipe($.rename('main.min.js')) + .pipe(gulp.dest('static')) +}); diff --git a/alma-server/src/main/resources/package.json b/alma-server/src/main/resources/package.json new file mode 100644 index 0000000..18e2da5 --- /dev/null +++ b/alma-server/src/main/resources/package.json @@ -0,0 +1,38 @@ +{ + "name": "alma-master", + "version": "0.1.0", + "description": "Simple web application", + "private": true, + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/la-brasse/alma-m2-2016.git" + }, + "keywords": [ + "alma" + ], + "author": "Stéphane Bégaudeau", + "license": "MIT", + "bugs": { + "url": "https://github.com/la-brasse/alma-m2-2016/issues" + }, + "homepage": "https://github.com/la-brasse/alma-m2-2016#readme", + "devDependencies": { + "browserify": "^13.1.0", + "gulp": "^3.9.1", + "gulp-browserify": "^0.5.1", + "gulp-clean": "^0.3.2", + "gulp-concat": "^2.6.0", + "gulp-jshint": "^2.0.1", + "gulp-load-plugins": "^1.2.4", + "gulp-rename": "^1.2.2", + "gulp-size": "^2.1.0", + "gulp-uglify": "^2.0.0", + "gulp-util": "^3.0.7", + "jshint": "^2.9.3", + "jshint-checkstyle-file-reporter": "0.0.1", + "jshint-stylish": "^2.2.1" + } +} diff --git a/alma-server/src/main/resources/static/folder/greatFunction.js b/alma-server/src/main/resources/static/folder/greatFunction.js new file mode 100644 index 0000000..98600cc --- /dev/null +++ b/alma-server/src/main/resources/static/folder/greatFunction.js @@ -0,0 +1,16 @@ +/******************************************************************************* + * Copyright (c) 2016 . + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the MIT License which + * accompanies this distribution, and is available at + * https://opensource.org/licenses/MIT + *******************************************************************************/ +(function () { + 'use strict'; + + var greatFunction = function () { + alert('This is great!'); + }; + + module.exports = greatFunction; +})(); diff --git a/alma-server/src/main/resources/static/main.js b/alma-server/src/main/resources/static/main.js new file mode 100644 index 0000000..0628e8d --- /dev/null +++ b/alma-server/src/main/resources/static/main.js @@ -0,0 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 . + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the MIT License which + * accompanies this distribution, and is available at + * https://opensource.org/licenses/MIT + *******************************************************************************/ +(function () { + 'use strict'; + + var greatFunction = require('./folder/greatFunction'); + greatFunction(); +})(); From 5bf9a8aaa8b17ae6fd7c2b8fdddc62ae7da6f43b Mon Sep 17 00:00:00 2001 From: Rintarou Date: Fri, 9 Nov 2018 16:33:06 +0100 Subject: [PATCH 16/20] github release --- .travis.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.travis.yml b/.travis.yml index bede313..1bb8bc7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,3 +20,15 @@ after_success: - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASSWORD - docker images - docker push labrasse/alma-server:latest + +before_deploy: + # Set up git user name and tag this commit + # - git config --local user.name "YOUR GIT USER NAME" + # - git config --local user.email "YOUR GIT USER EMAIL" + - git tag "$(date +'%Y%m%d%H%M%S')-$(git log --format=%h -1)" + +deploy: + provider: releases + api_key: "GITHUB OAUTH TOKEN" + file: "FILE TO UPLOAD" + skip_cleanup: true From afa5347c1bd2bcb2a7dbb70f87f97c4d2e1f750c Mon Sep 17 00:00:00 2001 From: Rintarou Date: Fri, 9 Nov 2018 16:33:06 +0100 Subject: [PATCH 17/20] github release --- .travis.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.travis.yml b/.travis.yml index bede313..1bb8bc7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,3 +20,15 @@ after_success: - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASSWORD - docker images - docker push labrasse/alma-server:latest + +before_deploy: + # Set up git user name and tag this commit + # - git config --local user.name "YOUR GIT USER NAME" + # - git config --local user.email "YOUR GIT USER EMAIL" + - git tag "$(date +'%Y%m%d%H%M%S')-$(git log --format=%h -1)" + +deploy: + provider: releases + api_key: "GITHUB OAUTH TOKEN" + file: "FILE TO UPLOAD" + skip_cleanup: true From 6232dee433a5f277f8df6fb69199b031bd65ea16 Mon Sep 17 00:00:00 2001 From: Rintarou Date: Fri, 9 Nov 2018 16:55:31 +0100 Subject: [PATCH 18/20] zbouidiboui --- .travis.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1bb8bc7..b9e7e87 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,14 +21,10 @@ after_success: - docker images - docker push labrasse/alma-server:latest -before_deploy: - # Set up git user name and tag this commit - # - git config --local user.name "YOUR GIT USER NAME" - # - git config --local user.email "YOUR GIT USER EMAIL" - - git tag "$(date +'%Y%m%d%H%M%S')-$(git log --format=%h -1)" - deploy: provider: releases - api_key: "GITHUB OAUTH TOKEN" - file: "FILE TO UPLOAD" + api_key: "32f1875d7f018e1af412a87a93d2a500e0a34a53" + file: "alma-server/target/alma-server-1.0.0-SNAPSHOT.jar" skip_cleanup: true + on: + tags: true From 57b92682bbacfa7d4c4f80a71b92b8fe43d3eaa4 Mon Sep 17 00:00:00 2001 From: Rintarou Date: Fri, 9 Nov 2018 17:07:11 +0100 Subject: [PATCH 19/20] build frontend launch resources thing --- .travis.yml | 10 +++++++++- alma-server/src/main/resources/static/index.html | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b9e7e87..c29fe2b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,14 +12,22 @@ branches: before_install: - docker version - docker info + - node --version + - npm --version script: + - cd alma-server/src/main/resources + - pwd + - npm install -g gulp + - npm install + - gulp minify + - cd ../../../../ - mvn clean verify -f alma-server/pom.xml -e after_success: - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASSWORD - docker images - - docker push labrasse/alma-server:latest + - docker push ORGANIZATION_NAME/alma-server:latest deploy: provider: releases diff --git a/alma-server/src/main/resources/static/index.html b/alma-server/src/main/resources/static/index.html index 26aff03..b928733 100644 --- a/alma-server/src/main/resources/static/index.html +++ b/alma-server/src/main/resources/static/index.html @@ -11,6 +11,6 @@

Home

Some static content

- + From f95b2ce89f4c041ac3044dd1c197040b26963328 Mon Sep 17 00:00:00 2001 From: Rintarou Date: Fri, 9 Nov 2018 17:11:02 +0100 Subject: [PATCH 20/20] travis build thing --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c29fe2b..4005966 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ script: after_success: - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASSWORD - docker images - - docker push ORGANIZATION_NAME/alma-server:latest + - docker push labrasse/alma-server:latest deploy: provider: releases