File tree Expand file tree Collapse file tree 4 files changed +3
-23
lines changed
localstack-core/localstack Expand file tree Collapse file tree 4 files changed +3
-23
lines changed Original file line number Diff line number Diff line change @@ -154,7 +154,7 @@ RUN SETUPTOOLS_SCM_PRETEND_VERSION_FOR_LOCALSTACK_CORE=${LOCALSTACK_BUILD_VERSIO
154
154
RUN --mount=type=cache,target=/root/.cache \
155
155
--mount=type=cache,target=/var/lib/localstack/cache \
156
156
source .venv/bin/activate && \
157
- DEBUG=1 python -m localstack.cli.lpm install \
157
+ python -m localstack.cli.lpm install \
158
158
lambda-runtime \
159
159
dynamodb-local && \
160
160
chown -R localstack:localstack /usr/lib/localstack && \
Original file line number Diff line number Diff line change @@ -115,22 +115,9 @@ def get_installed_dir(self) -> str | None:
115
115
and version.
116
116
:return: str representation of the installation directory path or None if the package is not installed anywhere
117
117
"""
118
- LOG .warning ("Getting installed dir for %s" , self .name )
119
118
for target in InstallTarget :
120
119
directory = self ._get_install_dir (target )
121
- LOG .warning (
122
- "target %s dir %s marker path %s" ,
123
- target ,
124
- directory ,
125
- self ._get_install_marker_path (directory ),
126
- )
127
- try :
128
- LOG .warning (os .listdir (directory ))
129
- except Exception :
130
- LOG .exception ("Error listing dir" )
131
-
132
120
if directory and os .path .exists (self ._get_install_marker_path (directory )):
133
- LOG .warning ("Returning installed dir for %s as %s" , self .name , directory )
134
121
return directory
135
122
136
123
def _get_install_dir (self , target : InstallTarget ) -> str :
Original file line number Diff line number Diff line change @@ -43,6 +43,8 @@ def _get_download_url(self) -> str:
43
43
44
44
def _post_process (self , target : InstallTarget ) -> None :
45
45
target_directory = self ._get_install_dir (target )
46
+ minimal_jre_path = os .path .join (target .value , self .name , f"{ self .version } .minimal" )
47
+ rm_rf (minimal_jre_path )
46
48
47
49
# If jlink is not available, use the environment as is
48
50
if not os .path .exists (os .path .join (target_directory , "bin" , "jlink" )):
@@ -51,10 +53,6 @@ def _post_process(self, target: InstallTarget) -> None:
51
53
52
54
# Build a custom JRE with only the necessary bits to minimise disk footprint
53
55
LOG .debug ("Optimising JRE installation" )
54
-
55
- minimal_jre_path = os .path .join (target .value , self .name , f"{ self .version } .minimal" )
56
- rm_rf (minimal_jre_path )
57
-
58
56
cmd = (
59
57
"bin/jlink --add-modules "
60
58
# Required modules
@@ -81,7 +79,6 @@ def _post_process(self, target: InstallTarget) -> None:
81
79
82
80
rm_rf (target_directory )
83
81
os .rename (minimal_jre_path , target_directory )
84
- LOG .warning ("Contents %s" , os .listdir (target_directory ))
85
82
86
83
def get_java_home (self ) -> str :
87
84
"""
Original file line number Diff line number Diff line change @@ -165,10 +165,6 @@ def do_start_thread(self) -> FuncThread:
165
165
"PATH" : path ,
166
166
}
167
167
168
- debug_cmd = cmd + ["-version" ]
169
- LOG .warning ("Debug starts %s %s" , cmd , env_vars )
170
- run (debug_cmd , env_vars = env_vars , print_error = False )
171
-
172
168
LOG .debug ("Starting DynamoDB Local: %s" , cmd )
173
169
t = ShellCommandThread (
174
170
cmd ,
You can’t perform that action at this time.
0 commit comments