Skip to content

Commit

Permalink
Added oes services in the gate.
Browse files Browse the repository at this point in the history
  • Loading branch information
sanopsmx committed Jul 17, 2020
1 parent 99c2d10 commit 51576ac
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 20 deletions.
10 changes: 10 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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"]
8 changes: 8 additions & 0 deletions Dockerfile-opsmx-ubuntu
Original file line number Diff line number Diff line change
@@ -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"]
30 changes: 15 additions & 15 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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/' }
Expand Down Expand Up @@ -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'
}
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -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 `'<projectName>Composite=true'`.
Expand Down
2 changes: 0 additions & 2 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@
}
}

enableFeaturePreview("VERSION_ORDERING_V2")

rootProject.name = "gate"

include "gate-api",
Expand Down

0 comments on commit 51576ac

Please sign in to comment.