Skip to content
Snippets Groups Projects
Commit a203557d authored by ThanKarab's avatar ThanKarab
Browse files

Minor changes.

parent b1e3d35a
No related branches found
No related tags found
1 merge request!8Dev merge middleware
......@@ -26,7 +26,7 @@ else
DOCKER="sudo docker"
fi
IMAGE="kkech/portal_backend"
IMAGE="thanasulas/portal_backend"
VCS_REF=$(git describe --tags --dirty)
VERSION=$(git describe --tags --dirty)
......@@ -34,9 +34,11 @@ docker build --build-arg BUILD_DATE=$(date -Iseconds) \
--build-arg VCS_REF=$VCS_REF \
--build-arg VERSION=$VERSION \
--tag "$IMAGE:latest" \
--tag "$IMAGE:$VERSION" \
.
docker push thanasulas/portal_backend:latest
BUGSNAG_KEY=""
eval $(grep -e "^\\s*BUGSNAG_KEY" Dockerfile | tr '\\' ' ')
......
......@@ -9,7 +9,6 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
@SpringBootApplication
public class MIPApplication {
......
......@@ -46,5 +46,4 @@ public class PersistenceConfiguration {
flyway.setDataSource(portalDataSource());
return flyway;
}
}
......@@ -7,13 +7,6 @@ package eu.hbp.mip.helpers;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.core.io.ClassPathResource;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
public class GenParameters {
......@@ -33,7 +26,7 @@ public class GenParameters {
private String galaxyReverseProxyPassword;
private GenParameters(){
private GenParameters() {
}
......@@ -49,31 +42,8 @@ public class GenParameters {
genParams.setGalaxyReverseProxyUsername(System.getenv("GALAXY_REVERSE_PROXY_USERNAME"));
genParams.setGalaxyReverseProxyPassword(System.getenv("GALAXY_REVERSE_PROXY_PASSWORD"));
//If environment variable not exists read from file.
if (genParams.getJwtSecret() == null){
throw new RuntimeException("Cannot find Enviroment Variables");
// logger.info("->>>>>>>Reading from file");
//
// File file = null;
// try {
// file = new ClassPathResource("config.properties").getFile();
// InputStream input = new FileInputStream(file);
// Properties prop = new Properties();
//
// // load a properties file
// prop.load(input);
//
// // get the property value and print it out
// genParams.setJwtSecret(prop.getProperty("jwtSecret"));
// genParams.setJwtIssuer(prop.getProperty("jwtIssuer"));
// genParams.setGalaxyURL(prop.getProperty("galaxyURL"));
// genParams.setGalaxyApiKey(prop.getProperty("galaxyApiKey"));
// genParams.setGalaxyReverseProxyUsername(prop.getProperty("galaxyReverseProxyUsername"));
// genParams.setGalaxyReverseProxyPassword(prop.getProperty("galaxyReverseProxyPassword"));
// } catch (IOException e) {
// logger.error("Cannot initialize GenParameters from config file", e);
// }
if (genParams.getJwtSecret() == null) {
throw new RuntimeException("Cannot find Environment Variables");
}
}
return genParams;
......@@ -88,7 +58,7 @@ public class GenParameters {
}
public String getJwtIssuer() {
return jwtIssuer;
return jwtIssuer;
}
private void setJwtIssuer(String jwtIssuer) {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment