You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ib...@apache.org on 2022/10/12 14:43:11 UTC
[ignite-3] branch main updated: IGNITE-17879 Packaging is broken (#1196)
This is an automated email from the ASF dual-hosted git repository.
ibessonov pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push:
new e0ac5ea30d IGNITE-17879 Packaging is broken (#1196)
e0ac5ea30d is described below
commit e0ac5ea30d055f32fe8ba67f7798e18ae4f92a53
Author: Vadim Pakhnushev <86...@users.noreply.github.com>
AuthorDate: Wed Oct 12 17:43:05 2022 +0300
IGNITE-17879 Packaging is broken (#1196)
---
packaging/build.gradle | 86 +++++++++++++---------
.../docker/ignite.java.util.logging.properties | 45 +++++++++++
packaging/linux/start.sh | 2 +-
3 files changed, 96 insertions(+), 37 deletions(-)
diff --git a/packaging/build.gradle b/packaging/build.gradle
index aeed596bc1..7076fe9923 100644
--- a/packaging/build.gradle
+++ b/packaging/build.gradle
@@ -47,39 +47,36 @@ task cliStartScript(type: CreateStartScripts) {
applicationName = 'ignite3-cli'
}
-def dbContents = spec -> {
- // create empty dirs that are required to start Ignite
- into('') {
- File.createTempDir().with {
- ["log", "etc", "work"].each {new File(absolutePath, it).mkdirs() }
- from (absolutePath) {
- includeEmptyDirs = true
- }
- }
- }
- into('') {
- from ("$rootDir/LICENSE")
- from ("$rootDir/NOTICE")
- from ("$rootDir/assembly/README.md")
- }
- into('etc') {
- from ("${buildDir}/scripts/bootstrap-config")
- from ("${buildDir}/config/ignite-config.conf")
- from ("${buildDir}/config/ignite.java.util.logging.properties")
- }
- into('bin') {
- fileMode 0755
- from ("$rootDir/packaging/scripts/ignite3-db.sh")
- }
- into('lib') {
- from(configurations.dbArtifacts)
- }
-}
-
distributions {
db {
distributionBaseName = 'ignite3-db'
- contents dbContents
+ contents {
+ into('') {
+ File.createTempDir().with {
+ ["log", "etc", "work"].each { new File(absolutePath, it).mkdirs() }
+ from(absolutePath) {
+ includeEmptyDirs = true
+ }
+ }
+ }
+ into('') {
+ from("$rootDir/LICENSE")
+ from("$rootDir/NOTICE")
+ from("$rootDir/assembly/README.md")
+ }
+ into('etc') {
+ from("${buildDir}/scripts/bootstrap-config")
+ from("${buildDir}/config/ignite-config.conf")
+ from("${buildDir}/config/ignite.java.util.logging.properties")
+ }
+ into('bin') {
+ fileMode 0755
+ from("$rootDir/packaging/scripts/ignite3-db.sh")
+ }
+ into('lib') {
+ from(configurations.dbArtifacts)
+ }
+ }
}
cli {
@@ -92,8 +89,6 @@ distributions {
includeEmptyDirs = true
}
}
- }
- into('') {
from ("$rootDir/LICENSE")
from ("$rootDir/NOTICE")
from ("$rootDir/assembly/README.md")
@@ -115,10 +110,29 @@ docker {
name 'apacheignite/ignite3'
dockerfile file('docker/Dockerfile')
- copySpec.into 'dist', dbContents
- copySpec.into('dist/bin') {
- fileMode 0755
- from('docker/docker-entrypoint.sh')
+ copySpec.into 'dist', {
+ into('') {
+ File.createTempDir().with {
+ ['etc', 'work'].each { new File(absolutePath, it).mkdirs() }
+ from(absolutePath) {
+ includeEmptyDirs = true
+ }
+ }
+ from("$rootDir/LICENSE")
+ from("$rootDir/NOTICE")
+ from("$rootDir/assembly/README.md")
+ }
+ into('etc') {
+ from('config/ignite-config.conf')
+ from('docker/ignite.java.util.logging.properties')
+ }
+ into('bin') {
+ fileMode 0755
+ from('docker/docker-entrypoint.sh')
+ }
+ into('lib') {
+ from(configurations.dbArtifacts)
+ }
}
}
diff --git a/packaging/docker/ignite.java.util.logging.properties b/packaging/docker/ignite.java.util.logging.properties
new file mode 100644
index 0000000000..312b25682e
--- /dev/null
+++ b/packaging/docker/ignite.java.util.logging.properties
@@ -0,0 +1,45 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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.
+#
+
+#########################################################################
+# Default java.util.logging configuration for Ignite instance.
+#
+# To use another config file use `java.util.logging.config.file` system
+# property. For example `java -Djava.util.logging.config.file=myfile`
+#########################################################################
+
+#
+# Comma-separated list of logging "handlers". Note that some of them may be
+# reconfigured (or even removed) at runtime according to system properties.
+handlers=java.util.logging.ConsoleHandler
+
+#
+# Default global logging level.
+# This specifies which kinds of events are logged across all loggers.
+# For any given category this global level can be overridden by a category
+# specific level.
+# Note that handlers also have a separate level setting to limit messages
+# printed through it.
+#
+.level=INFO
+
+# Console handler logs all messages with importance level `INFO` and above
+# into standard error stream (`System.err`).
+#
+java.util.logging.ConsoleHandler.formatter = org.apache.ignite.lang.JavaLoggerFormatter
+java.util.logging.ConsoleHandler.level = INFO
+java.util.logging.ConsoleHandler.encoding = UTF-8
diff --git a/packaging/linux/start.sh b/packaging/linux/start.sh
index c9d17b354f..4ccdf7b370 100644
--- a/packaging/linux/start.sh
+++ b/packaging/linux/start.sh
@@ -38,6 +38,6 @@ ${IGNITE3_EXTRA_JVM_ARGS} \
-classpath @INSTALL_DIR@/lib:@INSTALL_DIR@/lib/* org.apache.ignite.app.IgniteCliRunner \
--config-path ${CONFIG_FILE} \
--work-dir ${WORK_DIR} \
-${NODE_NAME}"
+--node-name ${NODE_NAME}"
${CMD}