From 02f5ef4902baf99336dbfb87f4719b277c190ada Mon Sep 17 00:00:00 2001 From: Ludovic Claude <ludovic.claude54@gmail.com> Date: Mon, 5 Sep 2016 17:02:48 +0200 Subject: [PATCH] Add labels to Docker image --- Dockerfile | 11 +++++++++++ .../hbp/mip/configuration/SecurityConfiguration.java | 1 + 2 files changed, 12 insertions(+) diff --git a/Dockerfile b/Dockerfile index 91b19277d..a7314b92e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,6 +15,17 @@ COPY docker/runner/config/application.tmpl /config/application.tmpl COPY docker/runner/README.md docker/runner/run.sh / COPY target/portal-backend-1.0.0-docker-packaging.jar backend.jar +# org.label-schema.build-date=$BUILD_DATE +# org.label-schema.vcs-ref=$VCS_REF +LABEL org.label-schema.schema-version="1.0" \ + org.label-schema.license="AGPLv3" \ + org.label-schema.name="portal-backend" \ + org.label-schema.description="Java backend for the MIP portal" \ + org.label-schema.url="https://mip.humanbrainproject.eu" \ + org.label-schema.vendor="LREN CHUV" \ + org.label-schema.docker.dockerfile="Dockerfile" \ + org.label-schema.memory-hint="2048" + EXPOSE 8080 CMD ["./run.sh"] diff --git a/src/main/java/eu/hbp/mip/configuration/SecurityConfiguration.java b/src/main/java/eu/hbp/mip/configuration/SecurityConfiguration.java index 53035fa94..21ea7f2d4 100644 --- a/src/main/java/eu/hbp/mip/configuration/SecurityConfiguration.java +++ b/src/main/java/eu/hbp/mip/configuration/SecurityConfiguration.java @@ -57,6 +57,7 @@ import java.net.URLEncoder; import java.security.Principal; // See https://spring.io/guides/tutorials/spring-boot-oauth2/ for reference about configuring OAuth2 login +// also http://cscarioni.blogspot.ch/2013/04/pro-spring-security-and-oauth-2.html /** * Configuration for security. -- GitLab