Skip to content

Commit

Permalink
💩 dirty fix to make docker build run
Browse files Browse the repository at this point in the history
  • Loading branch information
lukasbm committed Jun 9, 2021
1 parent 475b822 commit fe32732
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
9 changes: 7 additions & 2 deletions server/src/main/java/amosproj/server/Config.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,14 @@
@Service
public class Config {

private static String configFile;
private static String configFile = "/home/amos/config.json"; // FIXME default value da sonst nicht in docker läuft.

public Config(@Value("${CONFIG_FILE}") String CONFIG_FILE) {
/*public Config(@Value("${CONFIG_FILE}") String CONFIG_FILE) {
configFile = CONFIG_FILE;
}*/

@Value("${CONFIG_FILE}")
public void setConfigFile(String CONFIG_FILE) {
configFile = CONFIG_FILE;
}

Expand Down
3 changes: 2 additions & 1 deletion server/src/main/java/amosproj/server/GitLab.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,12 @@ public class GitLab {

private String apitoken;

private String gitlabHost = Config.getConfigNode().get("settings").get("gitLabHost").asText();
private String gitlabHost;

private final org.gitlab4j.api.GitLabApi api;

public GitLab(@Value("${GITLAB_ACCESS_TOKEN}") String token) {
this.gitlabHost = Config.getConfigNode().get("settings").get("gitLabHost").asText();
this.apitoken = token;
this.api = new GitLabApi(gitlabHost, apitoken);
}
Expand Down

0 comments on commit fe32732

Please sign in to comment.