Sets RUNTIME_DIR in runtimes, instead of openjdk base image.#94
Sets RUNTIME_DIR in runtimes, instead of openjdk base image.#94joaoandremartins merged 5 commits intomasterfrom
Conversation
|
|
||
| if [ "$DBG_ENABLE" = "true" ]; then | ||
| unset CDBG_DISABLE | ||
| DBG_AGENT="$( RUNTIME_DIR=$JETTY_BASE /opt/cdbg/format-env-appengine-vm.sh )" |
There was a problem hiding this comment.
This is completely removing the debugger. I don't think we want to do that.
| if [ "$DBG_ENABLE" = "true" ]; then | ||
| unset CDBG_DISABLE | ||
| DBG_AGENT="$( RUNTIME_DIR=$JETTY_BASE /opt/cdbg/format-env-appengine-vm.sh )" | ||
| DBG_AGENT="$(/opt/cdbg/format-env-appengine-vm.sh)" |
There was a problem hiding this comment.
I guess it can now just be
DBG_AGENT="/opt/cdbg/format-env-appengine-vm.sh"
There was a problem hiding this comment.
I think you still want /opt/cdbg/format-env-appengine-vm.sh to be evaled, no?
There was a problem hiding this comment.
$ export DBG_AGENT="$(/usr/local/google/home/joaomartins/Downloads/cdbg_java_agent/format-env-appengine-vm.sh)"
$ echo $DBG_AGENT
-agentpath:/usr/local/google/home/joaomartins/Downloads/cdbg_java_agent/cdbg_java_agent.so=--log_dir=/var/log/app_engine,--logtostderr=false,--cdbg_extra_class_path=/webapps/root/WEB-INF/classes:/webapps/root/WEB-INF/lib
(without the format-env-appengine-vm.sh fix)
meltsufin
left a comment
meltsufin
left a comment
There was a problem hiding this comment.
This is good, but we have to make sure that CDBG_APP_WEB_INF_DIR is set in the runtime (jetty/tomcat) before this file executes.
|
This change is pending internal change 155509870 from being submitted and published. |
$RUNTIME_DIR still read for backwards compatibility. See: GoogleCloudPlatform/openjdk-runtime#94 GoogleCloudPlatform/jetty-runtime#164 GoogleCloudPlatform/openjdk-runtime#64 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=155654900
joaoandremartins
force-pushed
the
unset-runtime-dir
branch
from
ab5efde to
2092df0
Compare
2 participants
Helps fixing #64
Used in conjunction with GoogleCloudPlatform/jetty-runtime#164
Will also require a change in format-env-appengine-vm.sh