Fabio/nginx-proxy-manager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Build tweaks

Browse source
This commit is contained in:
Jamie Curnow 2021-06-14 20:01:41 +10:00
parent 9ad594aa91
commit b26d2766a2
2 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Jenkinsfile vendored
View file

@ -141,29 +141,24 @@ pipeline {
archiveArtifacts(artifacts: 'docs/docs.tgz', allowEmptyArchive: false) archiveArtifacts(artifacts: 'docs/docs.tgz', allowEmptyArchive: false)
} }
} }
/*
stage('MultiArch Build') { stage('MultiArch Build') {
when { when {
allOf { not {
branch 'master' equals expected: 'UNSTABLE', actual: currentBuild.result
not {
equals expected: 'UNSTABLE', actual: currentBuild.result
}
} }
} }
steps { steps {
withCredentials([string(credentialsId: 'npm-sentry-dsn', variable: 'SENTRY_DSN')]) { withCredentials([string(credentialsId: 'npm-sentry-dsn', variable: 'SENTRY_DSN')]) {
withCredentials([usernamePassword(credentialsId: 'jc21-dockerhub', passwordVariable: 'dpass', usernameVariable: 'duser')]) { withCredentials([usernamePassword(credentialsId: 'jc21-dockerhub', passwordVariable: 'dpass', usernameVariable: 'duser')]) {
// Docker Login
sh "docker login -u '${duser}' -p '${dpass}'" sh "docker login -u '${duser}' -p '${dpass}'"
// Buildx to local files // Buildx with push from cache
// sh './scripts/buildx -o type=local,dest=docker-build'
// Buildx to with push
sh "./scripts/buildx --push ${BUILDX_PUSH_TAGS}" sh "./scripts/buildx --push ${BUILDX_PUSH_TAGS}"
// sh './scripts/buildx -o type=local,dest=docker-build'
} }
} }
} }
} }
*/
stage('Docs Deploy') { stage('Docs Deploy') {
when { when {
allOf { allOf {

7
scripts/buildx
View file

@ -1,11 +1,11 @@
#!/bin/bash -e #!/bin/bash
DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
. "$DIR/.common.sh" . "$DIR/.common.sh"
echo -e "${BLUE}❯ ${CYAN}Building docker multiarch: ${YELLOW}${*}${RESET}" echo -e "${BLUE}❯ ${CYAN}Building docker multiarch: ${YELLOW}${*}${RESET}"
cd "${DIR}/.." cd "${DIR}/.." || exit 1
# determine commit if not already set # determine commit if not already set
if [ "$BUILD_COMMIT" == "" ]; then if [ "$BUILD_COMMIT" == "" ]; then
@ -31,6 +31,7 @@ docker buildx build \
$@ \ $@ \
. .
rc=$?
docker buildx rm "${BUILDX_NAME:-npm}" docker buildx rm "${BUILDX_NAME:-npm}"
echo -e "${BLUE}❯ ${GREEN}Multiarch build Complete${RESET}" echo -e "${BLUE}❯ ${GREEN}Multiarch build Complete${RESET}"
exit $rc