mirror of
https://github.com/google/nomulus
synced 2026-09-19 14:34:18 +00:00
Make nomulus work locally (#2349)
Chose the default transaction manager based on RegistryEnvironment. This makes it possible to run nomulus on Jetty locally. Tested with the following: ```bash ./gradle :jetty:run -Penvironment=alpha curl http://localhost:8080/beta.app ``` The docker image is also updated to take an argument that specifies the environment. It runs locally as well but the container doesn't get access to locally stored credentials, so it fails to initialize the transaction manager.
This commit is contained in:
+2
-4
@@ -1,7 +1,5 @@
|
||||
FROM jetty:12-jdk21
|
||||
ADD --chown=jetty:jetty build/jetty-base /jetty-base
|
||||
ENV JETTY_BASE=/jetty-base
|
||||
WORKDIR "$JETTY_BASE"
|
||||
ADD --chown=jetty:jetty start.sh /
|
||||
EXPOSE 8080
|
||||
ENTRYPOINT ["java", "-jar", "/usr/local/jetty/start.jar"]
|
||||
|
||||
ENTRYPOINT ["/bin/sh", "/start.sh"]
|
||||
|
||||
+18
-1
@@ -22,7 +22,7 @@ tasks.register('copyJettyBase', Copy) {
|
||||
}
|
||||
|
||||
war {
|
||||
setArchiveBaseName("root")
|
||||
setArchiveBaseName("nomulus")
|
||||
setDestinationDirectory(layout.buildDirectory.dir('jetty-base/webapps'))
|
||||
dependsOn(tasks.named('copyJettyBase'))
|
||||
}
|
||||
@@ -49,4 +49,21 @@ tasks.register('buildNomulusImage', Exec) {
|
||||
dependsOn(tasks.named('stage'))
|
||||
}
|
||||
|
||||
tasks.register('run', JavaExec) {
|
||||
// We do the check when the task actually runs, not when we define it.
|
||||
// This way if one doesn't set the value, one can still run other tasks.
|
||||
doFirst {
|
||||
def jetty_home = System.getenv('JETTY_HOME')
|
||||
if (jetty_home == null) {
|
||||
throw new GradleException('JETTY_HOME is not set.')
|
||||
}
|
||||
}
|
||||
def jetty_home = System.getenv('JETTY_HOME')
|
||||
def environment = rootProject.environment
|
||||
workingDir(layout.buildDirectory.dir('jetty-base'))
|
||||
classpath = files(jetty_home + '/start.jar')
|
||||
systemProperty('google.registry.environment', environment)
|
||||
dependsOn(tasks.named('stage'))
|
||||
}
|
||||
|
||||
project.build.dependsOn(tasks.named('buildNomulusImage'))
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
|
||||
|
||||
<Configure id="wac" class="org.eclipse.jetty.ee8.webapp.WebAppContext">
|
||||
<Set name="contextPath">/</Set>
|
||||
<Set name="war">./webapps/nomulus.war</Set>
|
||||
</Configure>
|
||||
Executable
+18
@@ -0,0 +1,18 @@
|
||||
#!/bin/sh
|
||||
# Copyright 2024 The Nomulus Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
environment=$1
|
||||
cd /jetty-base
|
||||
java -jar /usr/local/jetty/start.jar -Dgoogle.registry.environment=${environment:-"alpha"}
|
||||
Reference in New Issue
Block a user