Mirrored_Repos/nginx-proxy-manager
1
0
Fork 0
mirror of https://github.com/jc21/nginx-proxy-manager.git synced 2024-08-30 18:22:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Better docker builds

Browse Source
This commit is contained in:
Jamie Curnow 2018-07-30 16:44:50 +10:00
parent 9abfdb0a92
commit f5446cbe40
3 changed files with 70 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Dockerfile
View File

@ -1,4 +1,4 @@
FROM jc21/node FROM jc21/nginx-proxy-manager-base:latest
MAINTAINER Jamie Curnow <jc@jc21.com> MAINTAINER Jamie Curnow <jc@jc21.com>
LABEL maintainer="Jamie Curnow <jc@jc21.com>" LABEL maintainer="Jamie Curnow <jc@jc21.com>"
@ -7,20 +7,7 @@ ENV SUPPRESS_NO_CONFIG_WARNING=1
ENV S6_FIX_ATTRS_HIDDEN=1 ENV S6_FIX_ATTRS_HIDDEN=1
RUN echo "fs.file-max = 65535" > /etc/sysctl.conf RUN echo "fs.file-max = 65535" > /etc/sysctl.conf
# Nginx, letsencrypt and other packages # Nginx, Node and required packages should already be installed from the base image
RUN apt-get update \
&& apt-get install --no-install-recommends --no-install-suggests -y curl ca-certificates apt-transport-https \
&& apt-key adv --fetch-keys http://dl.yarnpkg.com/debian/pubkey.gpg \
&& apt-key adv --fetch-keys http://nginx.org/keys/nginx_signing.key \
&& echo "deb http://nginx.org/packages/mainline/debian/ jessie nginx" > /etc/apt/sources.list.d/nginx.list \
&& echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
&& echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
&& apt-get update \
&& apt-get install --no-install-recommends --no-install-suggests -y \
gnupg openssl dirmngr apt-transport-https wget \
inetutils-ping build-essential apache2-utils yarn nginx \
&& apt-get install --no-install-recommends --no-install-suggests -y certbot letsencrypt -t jessie-backports \
&& apt-get clean
# root filesystem # root filesystem
COPY rootfs / COPY rootfs /

18
Dockerfile.armhf
View File

@ -1,24 +1,13 @@
FROM jc21/node:armhf FROM jc21/nginx-proxy-manager-base:armhf
MAINTAINER Jamie Curnow <jc@jc21.com> MAINTAINER Jamie Curnow <jc@jc21.com>
LABEL maintainer="Jamie Curnow <jc@jc21.com>" LABEL maintainer="Jamie Curnow <jc@jc21.com>"
RUN [ "cross-build-start" ]
ENV SUPPRESS_NO_CONFIG_WARNING=1 ENV SUPPRESS_NO_CONFIG_WARNING=1
ENV S6_FIX_ATTRS_HIDDEN=1 ENV S6_FIX_ATTRS_HIDDEN=1
RUN echo "fs.file-max = 65535" > /etc/sysctl.conf RUN echo "fs.file-max = 65535" > /etc/sysctl.conf
# Nginx, letsencrypt and other packages # Nginx, Node and required packages should already be installed from the base image
RUN apt-get update \
&& apt-get install --no-install-recommends --no-install-suggests -y ca-certificates apt-transport-https \
&& echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
&& apt-get update \
&& apt-get install --no-install-recommends --no-install-suggests -y \
gnupg openssl dirmngr apt-transport-https wget nginx-full \
inetutils-ping build-essential apache2-utils \
&& apt-get install --no-install-recommends --no-install-suggests -y certbot letsencrypt -t jessie-backports \
&& apt-get clean
# root filesystem # root filesystem
COPY rootfs / COPY rootfs /
@ -34,8 +23,7 @@ ADD dist /srv/app/dist
ADD node_modules /srv/app/node_modules ADD node_modules /srv/app/node_modules
ADD src/backend /srv/app/src/backend ADD src/backend /srv/app/src/backend
ADD package.json /srv/app/package.json ADD package.json /srv/app/package.json
ADD knexfile.js /srv/app/knexfile.js
RUN [ "cross-build-end" ]
# Volumes # Volumes
VOLUME [ "/data", "/etc/letsencrypt" ] VOLUME [ "/data", "/etc/letsencrypt" ]

107
Jenkinsfile vendored
View File

@ -8,7 +8,8 @@ pipeline {
IMAGE_NAME = "nginx-proxy-manager" IMAGE_NAME = "nginx-proxy-manager"
TEMP_IMAGE_NAME = "nginx-proxy-manager-build_${BUILD_NUMBER}" TEMP_IMAGE_NAME = "nginx-proxy-manager-build_${BUILD_NUMBER}"
TEMP_IMAGE_NAME_ARM = "nginx-proxy-manager-arm-build_${BUILD_NUMBER}" TEMP_IMAGE_NAME_ARM = "nginx-proxy-manager-arm-build_${BUILD_NUMBER}"
TAG_VERSION = getPackageVersion() //TAG_VERSION = getPackageVersion()
TAG_VERSION = "preview"
} }
stages { stages {
stage('Prepare') { stage('Prepare') {
@ -16,82 +17,72 @@ pipeline {
sh 'docker pull $DOCKER_CI_TOOLS' sh 'docker pull $DOCKER_CI_TOOLS'
} }
} }
stage('Build x86_64') { stages {
stage('Build') {
parallel {
stage('x86_64') {
steps { steps {
ansiColor('xterm') { ansiColor('xterm') {
sh 'docker run --rm -v $(pwd):/srv/app -w /srv/app jc21/node:latest yarn --registry=$NPM_REGISTRY install' // Codebase
sh 'docker run --rm -v $(pwd):/srv/app -w /srv/app jc21/node:latest npm runscript build' sh 'docker run --rm -v $(pwd):/srv/app -w /srv/app $IMAGE_NAME-base:latest yarn --registry=$NPM_REGISTRY install'
sh 'docker run --rm -v $(pwd):/srv/app -w /srv/app $IMAGE_NAME-base:latest npm runscript build'
sh 'rm -rf node_modules' sh 'rm -rf node_modules'
sh 'docker run --rm -v $(pwd):/srv/app -w /srv/app jc21/node yarn --registry=$NPM_REGISTRY install --prod' sh 'docker run --rm -v $(pwd):/srv/app -w /srv/app $IMAGE_NAME-base:latest yarn --registry=$NPM_REGISTRY install --prod'
sh 'docker run --rm -v $(pwd):/data $DOCKER_CI_TOOLS node-prune' sh 'docker run --rm -v $(pwd):/data $DOCKER_CI_TOOLS node-prune'
sh 'docker build --pull --no-cache --squash --compress -t $TEMP_IMAGE_NAME .'
}
}
}
//stage('Build armhf') {
// steps {
// ansiColor('xterm') {
// sh 'docker run --rm -v $(pwd):/srv/app -w /srv/app jc21/node:armhf yarn --registry=$NPM_REGISTRY install'
// sh 'docker run --rm -v $(pwd):/srv/app -w /srv/app jc21/node:armhf npm run-script build'
// sh 'rm -rf node_modules'
// sh 'docker run --rm -v $(pwd):/srv/app -w /srv/app jc21/node:armhf yarn --registry=$NPM_REGISTRY install --prod'
// sh 'docker run --rm -v $(pwd):/data $DOCKER_CI_TOOLS node-prune'
// sh 'docker build --pull --no-cache --squash --compress -t $TEMP_IMAGE_NAME_ARM -f Dockerfile.armhf .'
// }
// }
//}
stage('Publish Private') {
steps {
sh 'docker tag $TEMP_IMAGE_NAME ${DOCKER_PRIVATE_REGISTRY}/$IMAGE_NAME:$TAG_VERSION'
sh 'docker push ${DOCKER_PRIVATE_REGISTRY}/$IMAGE_NAME:$TAG_VERSION'
sh 'docker tag $TEMP_IMAGE_NAME_ARM ${DOCKER_PRIVATE_REGISTRY}/$IMAGE_NAME:$TAG_VERSION-armhf' // Docker Build
sh 'docker push ${DOCKER_PRIVATE_REGISTRY}/$IMAGE_NAME:$TAG_VERSION-armhf' sh 'docker build --pull --no-cache --squash --compress -t $TEMP_IMAGE_NAME .'
}
} // Private Registry
stage('Publish Public') { sh 'docker tag $TEMP_IMAGE_NAME $DOCKER_PRIVATE_REGISTRY/$IMAGE_NAME:$TAG_VERSION'
when { sh 'docker push $DOCKER_PRIVATE_REGISTRY/$IMAGE_NAME:$TAG_VERSION'
branch 'master'
} // Dockerhub
steps {
sh 'docker tag $TEMP_IMAGE_NAME ${DOCKER_PRIVATE_REGISTRY}/$IMAGE_NAME:latest'
sh 'docker push ${DOCKER_PRIVATE_REGISTRY}/$IMAGE_NAME:latest'
sh 'docker tag $TEMP_IMAGE_NAME docker.io/jc21/$IMAGE_NAME:latest'
sh 'docker tag $TEMP_IMAGE_NAME docker.io/jc21/$IMAGE_NAME:$TAG_VERSION' sh 'docker tag $TEMP_IMAGE_NAME docker.io/jc21/$IMAGE_NAME:$TAG_VERSION'
//sh 'docker tag $TEMP_IMAGE_NAME_ARM docker.io/jc21/$IMAGE_NAME:latest-armhf'
//sh 'docker tag $TEMP_IMAGE_NAME_ARM docker.io/jc21/$IMAGE_NAME:$TAG_VERSION-armhf'
withCredentials([usernamePassword(credentialsId: 'jc21-dockerhub', passwordVariable: 'dpass', usernameVariable: 'duser')]) { withCredentials([usernamePassword(credentialsId: 'jc21-dockerhub', passwordVariable: 'dpass', usernameVariable: 'duser')]) {
sh "docker login -u '${duser}' -p '${dpass}'" sh "docker login -u '${duser}' -p '$dpass'"
sh 'docker push docker.io/jc21/$IMAGE_NAME:latest'
sh 'docker push docker.io/jc21/$IMAGE_NAME:$TAG_VERSION' sh 'docker push docker.io/jc21/$IMAGE_NAME:$TAG_VERSION'
}
//sh 'docker push docker.io/jc21/$IMAGE_NAME:latest-armhf' sh 'docker rmi $TEMP_IMAGE_NAME'
//sh 'docker push docker.io/jc21/$IMAGE_NAME:$TAG_VERSION-armhf'
} }
} }
} }
stage('Publish Beta') { stage('armhf') {
when { agent {
branch 'v2-rewrite' label 'armhf'
} }
steps { steps {
sh 'docker tag $TEMP_IMAGE_NAME ${DOCKER_PRIVATE_REGISTRY}/$IMAGE_NAME:preview' ansiColor('xterm') {
sh 'docker push ${DOCKER_PRIVATE_REGISTRY}/$IMAGE_NAME:preview' // Codebase
sh 'docker tag $TEMP_IMAGE_NAME docker.io/jc21/$IMAGE_NAME:preview' sh 'docker run --rm -v $(pwd):/srv/app -w /srv/app $IMAGE_NAME-base:armhf yarn --registry=$NPM_REGISTRY install'
//sh 'docker tag $TEMP_IMAGE_NAME_ARM docker.io/jc21/$IMAGE_NAME:preview-armhf' sh 'docker run --rm -v $(pwd):/srv/app -w /srv/app $IMAGE_NAME-base:armhf npm runscript build'
sh 'rm -rf node_modules'
sh 'docker run --rm -v $(pwd):/srv/app -w /srv/app $IMAGE_NAME-base:armhf yarn --registry=$NPM_REGISTRY install --prod'
// Docker Build
sh 'docker build --pull --no-cache --squash --compress -t TEMP_IMAGE_NAME_ARM .'
// Private Registry
sh 'docker tag TEMP_IMAGE_NAME_ARM $DOCKER_PRIVATE_REGISTRY/$IMAGE_NAME:$TAG_VERSION-armhf'
sh 'docker push $DOCKER_PRIVATE_REGISTRY/$IMAGE_NAME:$TAG_VERSION-armhf'
// Dockerhub
sh 'docker tag TEMP_IMAGE_NAME_ARM docker.io/jc21/$IMAGE_NAME:$TAG_VERSION-armhf'
withCredentials([usernamePassword(credentialsId: 'jc21-dockerhub', passwordVariable: 'dpass', usernameVariable: 'duser')]) { withCredentials([usernamePassword(credentialsId: 'jc21-dockerhub', passwordVariable: 'dpass', usernameVariable: 'duser')]) {
sh "docker login -u '${duser}' -p '${dpass}'" sh "docker login -u '${duser}' -p '$dpass'"
sh 'docker push docker.io/jc21/$IMAGE_NAME:preview' sh 'docker push docker.io/jc21/$IMAGE_NAME:$TAG_VERSION-armhf'
//sh 'docker push docker.io/jc21/$IMAGE_NAME:preview-armhf' }
sh 'docker rmi TEMP_IMAGE_NAME_ARM'
}
}
} }
} }
} }
} }
triggers {
bitbucketPush()
} }
post { post {
success { success {
@ -102,10 +93,6 @@ pipeline {
juxtapose event: 'failure' juxtapose event: 'failure'
sh 'figlet "FAILURE"' sh 'figlet "FAILURE"'
} }
always {
sh 'docker rmi $TEMP_IMAGE_NAME'
//sh 'docker rmi $TEMP_IMAGE_NAME_ARM'
}
} }
} }