Skip to content

fix assemble #73

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stoneshi-yunify merged 1 commit into from
Aug 11, 2025
Merged

fix assemble #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions java/images/ubuntu-java11/s2i/assemble
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh
# Global S2I variable setup
source `dirname "$0"`/s2i-setup
. `dirname "$0"`/s2i-setup

# Maven arguments setting up the environment
if [ "${DISABLE_ARTIFACTS}" = true ]; then
Expand All @@ -13,7 +13,7 @@ fi
# =========================================================================
# Helper functions:

function check_error() {
check_error() {
local label=$1
local error=$2
if [ ${error} -ne 0 ]; then
Expand All @@ -22,7 +22,7 @@ function check_error() {
fi
}

function get_maven_output_dir() {
get_maven_output_dir() {
local dir=""

# If multi module build and no ARTIFACT_DIR is set --> error
Expand Down Expand Up @@ -52,15 +52,15 @@ function get_maven_output_dir() {
echo ${dir}
}

function copy_dir() {
copy_dir() {
local src=$1
local dest=$2

# Copy recursively and preserve ownership: -a
cp -a ${src}/* ${dest}
}

function copy_artifacts() {
copy_artifacts() {
local dir=$1
local dest=$2

Expand All @@ -80,7 +80,7 @@ function copy_artifacts() {
cp -v ${cp_args} ${dest}
}

function setup_maven() {
setup_maven() {
if [ -n "$HTTP_PROXY_HOST" -a -n "$HTTP_PROXY_PORT" ]; then
xml="<proxy>\
<id>genproxy</id>\
Expand Down Expand Up @@ -117,7 +117,7 @@ function setup_maven() {
fi
}

function build_maven() {
build_maven() {
# Where artifacts are created during build
local build_dir=$1

Expand Down Expand Up @@ -173,7 +173,7 @@ function build_maven() {
# =========================================================================
# Gradle support

function get_gradle_output_dir() {
get_gradle_output_dir() {
local dir=""

# If multi module build and no ARTIFACT_DIR is set --> error
Expand All @@ -190,7 +190,7 @@ function get_gradle_output_dir() {
echo ${dir}
}

function build_gradle() {
build_gradle() {
# Where artifacts are created during build
local build_dir=$1

Expand Down
18 changes: 9 additions & 9 deletions java/images/ubuntu/s2i/assemble
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh
# Global S2I variable setup
source `dirname "$0"`/s2i-setup
. `dirname "$0"`/s2i-setup

# Maven arguments setting up the environment
if [ "${DISABLE_ARTIFACTS}" = true ]; then
Expand All @@ -13,7 +13,7 @@ fi
# =========================================================================
# Helper functions:

function check_error() {
check_error() {
local label=$1
local error=$2
if [ ${error} -ne 0 ]; then
Expand All @@ -22,7 +22,7 @@ function check_error() {
fi
}

function get_maven_output_dir() {
get_maven_output_dir() {
local dir=""

# If multi module build and no ARTIFACT_DIR is set --> error
Expand Down Expand Up @@ -52,15 +52,15 @@ function get_maven_output_dir() {
echo ${dir}
}

function copy_dir() {
copy_dir() {
local src=$1
local dest=$2

# Copy recursively and preserve ownership: -a
cp -a ${src}/* ${dest}
}

function copy_artifacts() {
copy_artifacts() {
local dir=$1
local dest=$2

Expand All @@ -80,7 +80,7 @@ function copy_artifacts() {
cp -v ${cp_args} ${dest}
}

function setup_maven() {
setup_maven() {
if [ -n "$HTTP_PROXY_HOST" -a -n "$HTTP_PROXY_PORT" ]; then
xml="<proxy>\
<id>genproxy</id>\
Expand Down Expand Up @@ -117,7 +117,7 @@ function setup_maven() {
fi
}

function build_maven() {
build_maven() {
# Where artifacts are created during build
local build_dir=$1

Expand Down Expand Up @@ -173,7 +173,7 @@ function build_maven() {
# =========================================================================
# Gradle support

function get_gradle_output_dir() {
get_gradle_output_dir() {
local dir=""

# If multi module build and no ARTIFACT_DIR is set --> error
Expand All @@ -190,7 +190,7 @@ function get_gradle_output_dir() {
echo ${dir}
}

function build_gradle() {
build_gradle() {
# Where artifacts are created during build
local build_dir=$1

Expand Down
18 changes: 9 additions & 9 deletions tomcat/images/tomcat85-java11-ubuntu/s2i/assemble
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh
# Global S2I variable setup
source `dirname "$0"`/s2i-setup
. `dirname "$0"`/s2i-setup

# Maven arguments setting up the environment
if [ "${DISABLE_ARTIFACTS}" = true ]; then
Expand All @@ -13,7 +13,7 @@ fi
# =========================================================================
# Helper functions:

function check_error() {
check_error() {
local label=$1
local error=$2
if [ ${error} -ne 0 ]; then
Expand All @@ -22,7 +22,7 @@ function check_error() {
fi
}

function get_maven_output_dir() {
get_maven_output_dir() {
local dir=""

# If multi module build and no ARTIFACT_DIR is set --> error
Expand Down Expand Up @@ -52,15 +52,15 @@ function get_maven_output_dir() {
echo ${dir}
}

function copy_dir() {
copy_dir() {
local src=$1
local dest=$2

# Copy recursively and preserve ownership: -a
cp -a ${src}/* ${dest}
}

function copy_artifacts() {
copy_artifacts() {
local dir=$1
local dest=$2

Expand All @@ -80,7 +80,7 @@ function copy_artifacts() {
cp -v ${cp_args} ${dest}
}

function setup_maven() {
setup_maven() {
if [ -n "$HTTP_PROXY_HOST" -a -n "$HTTP_PROXY_PORT" ]; then
xml="<proxy>\
<id>genproxy</id>\
Expand Down Expand Up @@ -117,7 +117,7 @@ function setup_maven() {
fi
}

function build_maven() {
build_maven() {
# Where artifacts are created during build
local build_dir=$1

Expand Down Expand Up @@ -173,7 +173,7 @@ function build_maven() {
# =========================================================================
# Gradle support

function get_gradle_output_dir() {
get_gradle_output_dir() {
local dir=""

# If multi module build and no ARTIFACT_DIR is set --> error
Expand All @@ -190,7 +190,7 @@ function get_gradle_output_dir() {
echo ${dir}
}

function build_gradle() {
build_gradle() {
# Where artifacts are created during build
local build_dir=$1

Expand Down
18 changes: 9 additions & 9 deletions tomcat/images/tomcat85-java8-ubuntu/s2i/assemble
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh
# Global S2I variable setup
source `dirname "$0"`/s2i-setup
. `dirname "$0"`/s2i-setup

# Maven arguments setting up the environment
if [ "${DISABLE_ARTIFACTS}" = true ]; then
Expand All @@ -13,7 +13,7 @@ fi
# =========================================================================
# Helper functions:

function check_error() {
check_error() {
local label=$1
local error=$2
if [ ${error} -ne 0 ]; then
Expand All @@ -22,7 +22,7 @@ function check_error() {
fi
}

function get_maven_output_dir() {
get_maven_output_dir() {
local dir=""

# If multi module build and no ARTIFACT_DIR is set --> error
Expand Down Expand Up @@ -52,15 +52,15 @@ function get_maven_output_dir() {
echo ${dir}
}

function copy_dir() {
copy_dir() {
local src=$1
local dest=$2

# Copy recursively and preserve ownership: -a
cp -a ${src}/* ${dest}
}

function copy_artifacts() {
copy_artifacts() {
local dir=$1
local dest=$2

Expand All @@ -80,7 +80,7 @@ function copy_artifacts() {
cp -v ${cp_args} ${dest}
}

function setup_maven() {
setup_maven() {
if [ -n "$HTTP_PROXY_HOST" -a -n "$HTTP_PROXY_PORT" ]; then
xml="<proxy>\
<id>genproxy</id>\
Expand Down Expand Up @@ -117,7 +117,7 @@ function setup_maven() {
fi
}

function build_maven() {
build_maven() {
# Where artifacts are created during build
local build_dir=$1

Expand Down Expand Up @@ -173,7 +173,7 @@ function build_maven() {
# =========================================================================
# Gradle support

function get_gradle_output_dir() {
get_gradle_output_dir() {
local dir=""

# If multi module build and no ARTIFACT_DIR is set --> error
Expand All @@ -190,7 +190,7 @@ function get_gradle_output_dir() {
echo ${dir}
}

function build_gradle() {
build_gradle() {
# Where artifacts are created during build
local build_dir=$1

Expand Down
Loading