Skip to content

Commit f5446cb

Browse files
author
Jamie Curnow
committed
Better docker builds
1 parent 9abfdb0 commit f5446cb

File tree

3 files changed

+65
-103
lines changed

3 files changed

+65
-103
lines changed

‎Dockerfile

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM jc21/node
1+
FROM jc21/nginx-proxy-manager-base:latest
22

33
MAINTAINER Jamie Curnow <[email protected]>
44
LABEL maintainer="Jamie Curnow <[email protected]>"
@@ -7,20 +7,7 @@ ENV SUPPRESS_NO_CONFIG_WARNING=1
77
ENV S6_FIX_ATTRS_HIDDEN=1
88
RUN echo "fs.file-max = 65535" > /etc/sysctl.conf
99

10-
# Nginx, letsencrypt and other packages
11-
RUN apt-get update \
12-
&& apt-get install --no-install-recommends --no-install-suggests -y curl ca-certificates apt-transport-https \
13-
&& apt-key adv --fetch-keys http://dl.yarnpkg.com/debian/pubkey.gpg \
14-
&& apt-key adv --fetch-keys http://nginx.org/keys/nginx_signing.key \
15-
&& echo "deb http://nginx.org/packages/mainline/debian/ jessie nginx" > /etc/apt/sources.list.d/nginx.list \
16-
&& echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
17-
&& echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
18-
&& apt-get update \
19-
&& apt-get install --no-install-recommends --no-install-suggests -y \
20-
gnupg openssl dirmngr apt-transport-https wget \
21-
inetutils-ping build-essential apache2-utils yarn nginx \
22-
&& apt-get install --no-install-recommends --no-install-suggests -y certbot letsencrypt -t jessie-backports \
23-
&& apt-get clean
10+
# Nginx, Node and required packages should already be installed from the base image
2411

2512
# root filesystem
2613
COPY rootfs /

‎Dockerfile.armhf

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,13 @@
1-
FROM jc21/node:armhf
1+
FROM jc21/nginx-proxy-manager-base:armhf
22

33
MAINTAINER Jamie Curnow <[email protected]>
44
LABEL maintainer="Jamie Curnow <[email protected]>"
55

6-
RUN [ "cross-build-start" ]
7-
86
ENV SUPPRESS_NO_CONFIG_WARNING=1
97
ENV S6_FIX_ATTRS_HIDDEN=1
108
RUN echo "fs.file-max = 65535" > /etc/sysctl.conf
119

12-
# Nginx, letsencrypt and other packages
13-
RUN apt-get update \
14-
&& apt-get install --no-install-recommends --no-install-suggests -y ca-certificates apt-transport-https \
15-
&& echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
16-
&& apt-get update \
17-
&& apt-get install --no-install-recommends --no-install-suggests -y \
18-
gnupg openssl dirmngr apt-transport-https wget nginx-full \
19-
inetutils-ping build-essential apache2-utils \
20-
&& apt-get install --no-install-recommends --no-install-suggests -y certbot letsencrypt -t jessie-backports \
21-
&& apt-get clean
10+
# Nginx, Node and required packages should already be installed from the base image
2211

2312
# root filesystem
2413
COPY rootfs /
@@ -34,8 +23,7 @@ ADD dist /srv/app/dist
3423
ADD node_modules /srv/app/node_modules
3524
ADD src/backend /srv/app/src/backend
3625
ADD package.json /srv/app/package.json
37-
38-
RUN [ "cross-build-end" ]
26+
ADD knexfile.js /srv/app/knexfile.js
3927

4028
# Volumes
4129
VOLUME [ "/data", "/etc/letsencrypt" ]

‎Jenkinsfile

Lines changed: 60 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -8,91 +8,82 @@ pipeline {
88
IMAGE_NAME = "nginx-proxy-manager"
99
TEMP_IMAGE_NAME = "nginx-proxy-manager-build_${BUILD_NUMBER}"
1010
TEMP_IMAGE_NAME_ARM = "nginx-proxy-manager-arm-build_${BUILD_NUMBER}"
11-
TAG_VERSION = getPackageVersion()
11+
//TAG_VERSION = getPackageVersion()
12+
TAG_VERSION = "preview"
1213
}
1314
stages {
1415
stage('Prepare') {
1516
steps {
1617
sh 'docker pull $DOCKER_CI_TOOLS'
1718
}
1819
}
19-
stage('Build x86_64') {
20-
steps {
21-
ansiColor('xterm') {
22-
sh 'docker run --rm -v $(pwd):/srv/app -w /srv/app jc21/node:latest yarn --registry=$NPM_REGISTRY install'
23-
sh 'docker run --rm -v $(pwd):/srv/app -w /srv/app jc21/node:latest npm runscript build'
24-
sh 'rm -rf node_modules'
25-
sh 'docker run --rm -v $(pwd):/srv/app -w /srv/app jc21/node yarn --registry=$NPM_REGISTRY install --prod'
26-
sh 'docker run --rm -v $(pwd):/data $DOCKER_CI_TOOLS node-prune'
27-
sh 'docker build --pull --no-cache --squash --compress -t $TEMP_IMAGE_NAME .'
28-
}
29-
}
30-
}
31-
//stage('Build armhf') {
32-
// steps {
33-
// ansiColor('xterm') {
34-
// sh 'docker run --rm -v $(pwd):/srv/app -w /srv/app jc21/node:armhf yarn --registry=$NPM_REGISTRY install'
35-
// sh 'docker run --rm -v $(pwd):/srv/app -w /srv/app jc21/node:armhf npm run-script build'
36-
// sh 'rm -rf node_modules'
37-
// sh 'docker run --rm -v $(pwd):/srv/app -w /srv/app jc21/node:armhf yarn --registry=$NPM_REGISTRY install --prod'
38-
// sh 'docker run --rm -v $(pwd):/data $DOCKER_CI_TOOLS node-prune'
39-
// sh 'docker build --pull --no-cache --squash --compress -t $TEMP_IMAGE_NAME_ARM -f Dockerfile.armhf .'
40-
// }
41-
// }
42-
//}
43-
stage('Publish Private') {
44-
steps {
45-
sh 'docker tag $TEMP_IMAGE_NAME ${DOCKER_PRIVATE_REGISTRY}/$IMAGE_NAME:$TAG_VERSION'
46-
sh 'docker push ${DOCKER_PRIVATE_REGISTRY}/$IMAGE_NAME:$TAG_VERSION'
20+
stages {
21+
stage('Build') {
22+
parallel {
23+
stage('x86_64') {
24+
steps {
25+
ansiColor('xterm') {
26+
// Codebase
27+
sh 'docker run --rm -v $(pwd):/srv/app -w /srv/app $IMAGE_NAME-base:latest yarn --registry=$NPM_REGISTRY install'
28+
sh 'docker run --rm -v $(pwd):/srv/app -w /srv/app $IMAGE_NAME-base:latest npm runscript build'
29+
sh 'rm -rf node_modules'
30+
sh 'docker run --rm -v $(pwd):/srv/app -w /srv/app $IMAGE_NAME-base:latest yarn --registry=$NPM_REGISTRY install --prod'
31+
sh 'docker run --rm -v $(pwd):/data $DOCKER_CI_TOOLS node-prune'
4732

48-
sh 'docker tag $TEMP_IMAGE_NAME_ARM ${DOCKER_PRIVATE_REGISTRY}/$IMAGE_NAME:$TAG_VERSION-armhf'
49-
sh 'docker push ${DOCKER_PRIVATE_REGISTRY}/$IMAGE_NAME:$TAG_VERSION-armhf'
50-
}
51-
}
52-
stage('Publish Public') {
53-
when {
54-
branch 'master'
55-
}
56-
steps {
57-
sh 'docker tag $TEMP_IMAGE_NAME ${DOCKER_PRIVATE_REGISTRY}/$IMAGE_NAME:latest'
58-
sh 'docker push ${DOCKER_PRIVATE_REGISTRY}/$IMAGE_NAME:latest'
59-
sh 'docker tag $TEMP_IMAGE_NAME docker.io/jc21/$IMAGE_NAME:latest'
60-
sh 'docker tag $TEMP_IMAGE_NAME docker.io/jc21/$IMAGE_NAME:$TAG_VERSION'
33+
// Docker Build
34+
sh 'docker build --pull --no-cache --squash --compress -t $TEMP_IMAGE_NAME .'
6135

62-
//sh 'docker tag $TEMP_IMAGE_NAME_ARM docker.io/jc21/$IMAGE_NAME:latest-armhf'
63-
//sh 'docker tag $TEMP_IMAGE_NAME_ARM docker.io/jc21/$IMAGE_NAME:$TAG_VERSION-armhf'
36+
// Private Registry
37+
sh 'docker tag $TEMP_IMAGE_NAME $DOCKER_PRIVATE_REGISTRY/$IMAGE_NAME:$TAG_VERSION'
38+
sh 'docker push $DOCKER_PRIVATE_REGISTRY/$IMAGE_NAME:$TAG_VERSION'
6439

65-
withCredentials([usernamePassword(credentialsId: 'jc21-dockerhub', passwordVariable: 'dpass', usernameVariable: 'duser')]) {
66-
sh "docker login -u '${duser}' -p '${dpass}'"
67-
sh 'docker push docker.io/jc21/$IMAGE_NAME:latest'
68-
sh 'docker push docker.io/jc21/$IMAGE_NAME:$TAG_VERSION'
40+
// Dockerhub
41+
sh 'docker tag $TEMP_IMAGE_NAME docker.io/jc21/$IMAGE_NAME:$TAG_VERSION'
6942

70-
//sh 'docker push docker.io/jc21/$IMAGE_NAME:latest-armhf'
71-
//sh 'docker push docker.io/jc21/$IMAGE_NAME:$TAG_VERSION-armhf'
72-
}
73-
}
74-
}
75-
stage('Publish Beta') {
76-
when {
77-
branch 'v2-rewrite'
78-
}
79-
steps {
80-
sh 'docker tag $TEMP_IMAGE_NAME ${DOCKER_PRIVATE_REGISTRY}/$IMAGE_NAME:preview'
81-
sh 'docker push ${DOCKER_PRIVATE_REGISTRY}/$IMAGE_NAME:preview'
82-
sh 'docker tag $TEMP_IMAGE_NAME docker.io/jc21/$IMAGE_NAME:preview'
83-
//sh 'docker tag $TEMP_IMAGE_NAME_ARM docker.io/jc21/$IMAGE_NAME:preview-armhf'
43+
withCredentials([usernamePassword(credentialsId: 'jc21-dockerhub', passwordVariable: 'dpass', usernameVariable: 'duser')]) {
44+
sh "docker login -u '${duser}' -p '$dpass'"
45+
sh 'docker push docker.io/jc21/$IMAGE_NAME:$TAG_VERSION'
46+
}
47+
48+
sh 'docker rmi $TEMP_IMAGE_NAME'
49+
}
50+
}
51+
}
52+
stage('armhf') {
53+
agent {
54+
label 'armhf'
55+
}
56+
steps {
57+
ansiColor('xterm') {
58+
// Codebase
59+
sh 'docker run --rm -v $(pwd):/srv/app -w /srv/app $IMAGE_NAME-base:armhf yarn --registry=$NPM_REGISTRY install'
60+
sh 'docker run --rm -v $(pwd):/srv/app -w /srv/app $IMAGE_NAME-base:armhf npm runscript build'
61+
sh 'rm -rf node_modules'
62+
sh 'docker run --rm -v $(pwd):/srv/app -w /srv/app $IMAGE_NAME-base:armhf yarn --registry=$NPM_REGISTRY install --prod'
63+
64+
// Docker Build
65+
sh 'docker build --pull --no-cache --squash --compress -t TEMP_IMAGE_NAME_ARM .'
8466

85-
withCredentials([usernamePassword(credentialsId: 'jc21-dockerhub', passwordVariable: 'dpass', usernameVariable: 'duser')]) {
86-
sh "docker login -u '${duser}' -p '${dpass}'"
87-
sh 'docker push docker.io/jc21/$IMAGE_NAME:preview'
88-
//sh 'docker push docker.io/jc21/$IMAGE_NAME:preview-armhf'
67+
// Private Registry
68+
sh 'docker tag TEMP_IMAGE_NAME_ARM $DOCKER_PRIVATE_REGISTRY/$IMAGE_NAME:$TAG_VERSION-armhf'
69+
sh 'docker push $DOCKER_PRIVATE_REGISTRY/$IMAGE_NAME:$TAG_VERSION-armhf'
70+
71+
// Dockerhub
72+
sh 'docker tag TEMP_IMAGE_NAME_ARM docker.io/jc21/$IMAGE_NAME:$TAG_VERSION-armhf'
73+
74+
withCredentials([usernamePassword(credentialsId: 'jc21-dockerhub', passwordVariable: 'dpass', usernameVariable: 'duser')]) {
75+
sh "docker login -u '${duser}' -p '$dpass'"
76+
sh 'docker push docker.io/jc21/$IMAGE_NAME:$TAG_VERSION-armhf'
77+
}
78+
79+
sh 'docker rmi TEMP_IMAGE_NAME_ARM'
80+
}
81+
}
82+
}
8983
}
9084
}
9185
}
9286
}
93-
triggers {
94-
bitbucketPush()
95-
}
9687
post {
9788
success {
9889
juxtapose event: 'success'
@@ -102,10 +93,6 @@ pipeline {
10293
juxtapose event: 'failure'
10394
sh 'figlet "FAILURE"'
10495
}
105-
always {
106-
sh 'docker rmi $TEMP_IMAGE_NAME'
107-
//sh 'docker rmi $TEMP_IMAGE_NAME_ARM'
108-
}
10996
}
11097
}
11198

0 commit comments

Comments
 (0)