inteligr8/acs-community-packaging
1
0
Fork 0
mirror of https://github.com/Alfresco/acs-community-packaging.git synced 2026-09-16 18:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

ACS-896 Fix community PR builds (#1161)

Browse Source 
- **scripts/travis/init.sh**: execute the docker logins only on branch builds
- **~/.m2/settings.xml**: remove `quay.io` & `docker.io` server definitions
  (the docker logins in the init.sh script should be enough)
This commit is contained in:
CezarLeahu
2020-11-20 11:10:29 +02:00
committed by GitHub
parent f7911e1760
commit d24ea60a08
2 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.settings.xml
+1 -12
View File
@@ -15,7 +15,7 @@
<enabled>true</enabled> <enabled>true</enabled>
</snapshots> </snapshots>
<name>Alfresco Internal Repository</name> <name>Alfresco Internal Repository</name>
<url>https://artifacts.alfresco.com/nexus/content/groups/internal</url> <url>https://artifacts.alfresco.com/nexus/content/groups/public</url>
</repository> </repository>
</repositories> </repositories>
<pluginRepositories> <pluginRepositories>
@@ -32,22 +32,11 @@
</profile> </profile>
</profiles> </profiles>
<servers> <servers>
<server> <server>
<id>alfresco-internal</id> <id>alfresco-internal</id>
<username>${env.MAVEN_USERNAME}</username> <username>${env.MAVEN_USERNAME}</username>
<password>${env.MAVEN_PASSWORD}</password> <password>${env.MAVEN_PASSWORD}</password>
</server> </server>
<server>
<id>quay.io</id>
<username>${env.QUAY_USERNAME}</username>
<password>${env.QUAY_PASSWORD}</password>
</server>
<server>
<id>docker.io</id>
<username>${env.DOCKERHUB_USERNAME}</username>
<password>${env.DOCKERHUB_PASSWORD}</password>
</server>
</servers> </servers>
</settings> </settings>
scripts/travis/init.sh
+4 -2
View File
@@ -9,8 +9,10 @@ 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
echo "${DOCKERHUB_PASSWORD}" | docker login -u="${DOCKERHUB_USERNAME}" --password-stdin if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
echo "${QUAY_PASSWORD}" | docker login -u="${QUAY_USERNAME}" --password-stdin quay.io echo "${DOCKERHUB_PASSWORD}" | docker login -u="${DOCKERHUB_USERNAME}" --password-stdin
echo "${QUAY_PASSWORD}" | docker login -u="${QUAY_USERNAME}" --password-stdin quay.io
fi
# Enable experimental docker features (for the image squash option) # Enable experimental docker features (for the image squash option)
echo '{"experimental":true}' | sudo tee /etc/docker/daemon.json echo '{"experimental":true}' | sudo tee /etc/docker/daemon.json