inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
aftene
2020-08-26 18:55:05 +03:00
parent aac90e35fc ba495822bc
commit 70b0e35099
5 changed files with 40 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@@ -235,7 +235,6 @@ jobs:
# TODO enable job # TODO enable job
- name: "Push to Nexus" - name: "Push to Nexus"
stage: release stage: release
if: false
before_script: bash scripts/travis/verify_release_tag.sh before_script: bash scripts/travis/verify_release_tag.sh
script: travis_wait 40 bash scripts/travis/maven_release.sh script: travis_wait 40 bash scripts/travis/maven_release.sh

38
packaging/docker-alfresco/pom.xml
View File

@@ -189,15 +189,16 @@
</build> </build>
</image> </image>
<!-- DockerHub image --> <!-- DockerHub image -->
<image> <!-- todo enable when the dockerhub credentials are set on the project -->
<name>${image.name}:${image.tag}</name> <!-- <image>-->
<build> <!-- <name>${image.name}:${image.tag}</name>-->
<dockerFileDir>${project.basedir}/</dockerFileDir> <!-- <build>-->
<buildOptions> <!-- <dockerFileDir>${project.basedir}/</dockerFileDir>-->
<squash>true</squash> <!-- <buildOptions>-->
</buildOptions> <!-- <squash>true</squash>-->
</build> <!-- </buildOptions>-->
</image> <!-- </build>-->
<!-- </image>-->
</images> </images>
</configuration> </configuration>
<executions> <executions>
@@ -237,15 +238,16 @@
</build> </build>
</image> </image>
<!-- DockerHub image --> <!-- DockerHub image -->
<image> <!-- todo enable when the dockerhub credentials are set on the project -->
<name>${image.name}:${project.version}</name> <!-- <image>-->
<build> <!-- <name>${image.name}:${project.version}</name>-->
<dockerFileDir>${project.basedir}/</dockerFileDir> <!-- <build>-->
<buildOptions> <!-- <dockerFileDir>${project.basedir}/</dockerFileDir>-->
<squash>true</squash> <!-- <buildOptions>-->
</buildOptions> <!-- <squash>true</squash>-->
</build> <!-- </buildOptions>-->
</image> <!-- </build>-->
<!-- </image>-->
</images> </images>
</configuration> </configuration>
<executions> <executions>

4
scripts/travis/build.sh
View File

@@ -4,9 +4,11 @@ pushd "$(dirname "${BASH_SOURCE[0]}")/../../"
source "$(dirname "${BASH_SOURCE[0]}")/build_functions.sh" source "$(dirname "${BASH_SOURCE[0]}")/build_functions.sh"
if [ "${TRAVIS_BUILD_STAGE_NAME,,}" = "release" ] && [ "${TRAVIS_BRANCH}" = "master" ] && isBranchBuild ; then if isBranchBuild && [ "${TRAVIS_BRANCH}" = "master" ] && [ "${TRAVIS_BUILD_STAGE_NAME,,}" = "release" ] ; then
# update ":latest" image tags on remote repositories by using the maven *internal* profile
PROFILES="-Pinternal" PROFILES="-Pinternal"
else else
# build the ":latest" image tags locally with the maven *communityDocker* profile
PROFILES="-PcommunityDocker" PROFILES="-PcommunityDocker"
fi fi

15
scripts/travis/build_functions.sh
View File

@@ -111,3 +111,18 @@ function pullAndBuildSameBranchOnUpstream() {
popd popd
} }
function retieveLatestTag() {
local REPO="${1}"
local BRANCH="${2}"
local LOCAL_PATH="/tmp/$(basename "${REPO%.git}")"
git clone -q -b "${BRANCH}" "https://${GIT_USERNAME}:${GIT_PASSWORD}@${REPO}" "${LOCAL_PATH}"
pushd "${LOCAL_PATH}" >/dev/null
git describe --abbrev=0 --tags
popd >/dev/null
rm -rf "${LOCAL_PATH}"
}

2
scripts/travis/init.sh
View File

@@ -7,6 +7,8 @@ mkdir -p "${HOME}/.m2" && cp -f .travis.settings.xml "${HOME}/.m2/settings.xml"
find "${HOME}/.m2/repository/" -type d -name "*-SNAPSHOT*" | xargs -r -l rm -rf find "${HOME}/.m2/repository/" -type d -name "*-SNAPSHOT*" | xargs -r -l rm -rf
# Docker Logins # Docker Logins
# todo enable when the dockerhub credentials are set on the project
#echo "${DOCKERHUB_USERNAME}" | docker login -u="${DOCKERHUB_PASSWORD}" --password-stdin
echo "${QUAY_PASSWORD}" | docker login -u="${QUAY_USERNAME}" --password-stdin quay.io echo "${QUAY_PASSWORD}" | docker login -u="${QUAY_USERNAME}" --password-stdin quay.io
# Enable experimental docker features (for the image squash option) # Enable experimental docker features (for the image squash option)