From 51576ac7042c8d8f970d5f65f0d9fd262de51d44 Mon Sep 17 00:00:00 2001 From: sanopsmx Date: Fri, 17 Jul 2020 11:54:13 +0530 Subject: [PATCH] Added oes services in the gate. --- Dockerfile | 10 ++++++++++ Dockerfile-opsmx-ubuntu | 8 ++++++++ build.gradle | 30 +++++++++++++++--------------- gradle.properties | 6 +++--- settings.gradle | 2 -- 5 files changed, 36 insertions(+), 20 deletions(-) create mode 100644 Dockerfile create mode 100644 Dockerfile-opsmx-ubuntu diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000000..27b5ba7bcc --- /dev/null +++ b/Dockerfile @@ -0,0 +1,10 @@ + +FROM registry.access.redhat.com/ubi8/ubi +MAINTAINER sig-platform@spinnaker.io +COPY ./gate-web/build/install/gate /opt/gate +RUN yum -y install java-11-openjdk-headless.x86_64 wget vim +RUN adduser spinnaker + +RUN mkdir -p /opt/gate/plugins +USER spinnaker +CMD ["/opt/gate/bin/gate"] diff --git a/Dockerfile-opsmx-ubuntu b/Dockerfile-opsmx-ubuntu new file mode 100644 index 0000000000..16c55f9c33 --- /dev/null +++ b/Dockerfile-opsmx-ubuntu @@ -0,0 +1,8 @@ +FROM ubuntu:bionic +MAINTAINER sig-platform@spinnaker.io +COPY ./gate-web/build/install/gate /opt/gate +RUN apt-get update && apt-get -y install openjdk-8-jre-headless wget +RUN adduser --disabled-login --system spinnaker +RUN mkdir -p /opt/gate/plugins && chown -R spinnaker:nogroup /opt/gate/plugins +USER spinnaker +CMD ["/opt/gate/bin/gate"] diff --git a/build.gradle b/build.gradle index 516b949774..7fa3f7db2d 100644 --- a/build.gradle +++ b/build.gradle @@ -10,16 +10,16 @@ allprojects { group = "com.netflix.spinnaker.gate" - if ([korkVersion, fiatVersion].find { it.endsWith('-SNAPSHOT') }) { - repositories { - mavenLocal() - } - } - - if (name != "gate-bom" && name != "gate-api") { + if (name != "gate-bom") { apply plugin: 'java-library' apply plugin: 'groovy' + if ([korkVersion, fiatVersion].find { it.endsWith('-SNAPSHOT') }) { + repositories { + mavenLocal() + } + } + repositories { maven { url 'https://build.shibboleth.net/nexus/content/repositories/releases/' } maven { url 'https://repository.mulesoft.org/releases/' } @@ -52,17 +52,17 @@ allprojects { exclude group: 'javax.servlet', module: 'servlet-api' exclude group: 'javax.servlet', module: 'javax.servlet-api' } - } - tasks.withType(JavaExec) { - if (System.getProperty('DEBUG', 'false') == 'true') { - jvmArgs '-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8184' + tasks.withType(JavaExec) { + if (System.getProperty('DEBUG', 'false') == 'true') { + jvmArgs '-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8184' + } } - } - test { - testLogging { - exceptionFormat = 'full' + test { + testLogging { + exceptionFormat = 'full' + } } } } diff --git a/gradle.properties b/gradle.properties index fa4ddbd327..ee88653619 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,10 +1,10 @@ enablePublishing=false -fiatVersion=1.22.0 +fiatVersion=1.19.1 includeProviders=basic,iap,ldap,oauth2,saml,x509 -korkVersion=7.54.0 +korkVersion=7.43.1 kotlinVersion=1.3.71 org.gradle.parallel=true -spinnakerGradleVersion=8.3.0 +spinnakerGradleVersion=8.1.1 # To enable a composite reference to a project, set the # project property `'Composite=true'`. diff --git a/settings.gradle b/settings.gradle index 419cb29714..c212596961 100644 --- a/settings.gradle +++ b/settings.gradle @@ -22,8 +22,6 @@ } } -enableFeaturePreview("VERSION_ORDERING_V2") - rootProject.name = "gate" include "gate-api",