Merge branch '83-docker-hub' into 'dev'

Resolve "Образ для docker hub"

Closes #83

See merge request romanov73/ng-tracker!46
This commit is contained in:
Anton Romanov 2019-04-05 18:03:16 +00:00
commit d26ab93629
5 changed files with 46 additions and 21 deletions

View File

@ -1,16 +1,11 @@
image: ubuntu:18.04
cache:
key: "$CI_PROJECT_ID"
paths:
- .gradle/
image: romanov73/is:ng-tracker-container
variables:
GRADLE_OPTS: "-Dorg.gradle.daemon=false"
before_script:
- 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
- apt-get install openjdk-8-jdk git -y
- service postgresql stop
- service postgresql start
- eval $(ssh-agent -s)
- echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null
- mkdir -p ~/.ssh
@ -20,12 +15,14 @@ before_script:
build:
stage: build
script: ./gradlew assemble
cache:
key: "$CI_PROJECT_ID"
policy: push
paths:
- build
- .gradle
checkRun:
stage: test
script: ./gradlew bootRun -Dng-tracker.check-run=true
checkStyle:
stage: test
script: ./gradlew check
deploy:
stage: deploy
@ -33,12 +30,6 @@ deploy:
- sh deploy/gdccloud/deploy.sh
only:
- dev
cache:
key: "$CI_PROJECT_ID"
policy: pull
paths:
- build
- .gradle
environment:
name: staging
url: http://193.110.3.124:8080

View File

@ -30,6 +30,10 @@ bootRun.dependsOn checkstyleMain
sourceCompatibility = 1.8
targetCompatibility = 1.8
bootRun {
systemProperties = System.properties
}
checkstyle {
project.ext.checkstyleVersion = '8.8'

View File

@ -2,13 +2,30 @@ package ru.ulstu;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.context.event.ApplicationReadyEvent;
import org.springframework.context.event.EventListener;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
import ru.ulstu.configuration.ApplicationProperties;
import ru.ulstu.core.repository.JpaDetachableRepositoryImpl;
@SpringBootApplication
@EnableJpaRepositories(repositoryBaseClass = JpaDetachableRepositoryImpl.class)
public class NgTrackerApplication {
private final ApplicationProperties applicationProperties;
public NgTrackerApplication(ApplicationProperties applicationProperties) {
this.applicationProperties = applicationProperties;
}
public static void main(String[] args) {
SpringApplication.run(NgTrackerApplication.class, args);
}
@EventListener(ApplicationReadyEvent.class)
public void doSomethingAfterStartup() {
System.out.println("hello world, I have just started up");
if (applicationProperties.isCheckRun()) {
System.exit(0);
}
}
}

View File

@ -11,12 +11,16 @@ import org.springframework.validation.annotation.Validated;
public class ApplicationProperties {
@NotBlank
private String baseUrl;
@NotBlank
private String undeadUserLogin;
private boolean devMode;
private boolean useHttps;
private boolean checkRun;
public boolean isUseHttps() {
return useHttps;
}
@ -48,4 +52,12 @@ public class ApplicationProperties {
public void setDevMode(boolean devMode) {
this.devMode = devMode;
}
public boolean isCheckRun() {
return checkRun;
}
public void setCheckRun(boolean checkRun) {
this.checkRun = checkRun;
}
}

View File

@ -35,4 +35,5 @@ liquibase.change-log=classpath:db/changelog-master.xml
ng-tracker.base-url=http://127.0.0.1:8080
ng-tracker.undead-user-login=admin
ng-tracker.dev-mode=true
ng-tracker.use-https=false
ng-tracker.use-https=false
ng-tracker.check-run=false