Skip to content

Commit 1ec46a4

Browse files
author
Jamie Curnow
committed
CI Updates and attempt to support armhf docker build
1 parent 5107d15 commit 1ec46a4

File tree

2 files changed

+82
-13
lines changed

2 files changed

+82
-13
lines changed

‎Dockerfile.armhf

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
FROM jc21/node:armhf
2+
3+
MAINTAINER Jamie Curnow <[email protected]>
4+
LABEL maintainer="Jamie Curnow <[email protected]>"
5+
6+
RUN [ "cross-build-start" ]
7+
8+
ENV SUPPRESS_NO_CONFIG_WARNING=1
9+
ENV S6_FIX_ATTRS_HIDDEN=1
10+
RUN echo "fs.file-max = 65535" > /etc/sysctl.conf
11+
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
22+
23+
# root filesystem
24+
COPY rootfs /
25+
26+
# s6 overlay
27+
RUN curl -L -o /tmp/s6-overlay-amd64.tar.gz "https://github.com/just-containers/s6-overlay/releases/download/v1.21.4.0/s6-overlay-armhf.tar.gz" \
28+
&& tar xzf /tmp/s6-overlay-armhf.tar.gz -C /
29+
30+
# App
31+
ENV NODE_ENV=production
32+
33+
ADD dist /srv/app/dist
34+
ADD node_modules /srv/app/node_modules
35+
ADD src/backend /srv/app/src/backend
36+
ADD package.json /srv/app/package.json
37+
38+
RUN [ "cross-build-end" ]
39+
40+
# Volumes
41+
VOLUME [ "/data", "/etc/letsencrypt" ]
42+
CMD [ "/init" ]
43+
44+
HEALTHCHECK --interval=15s --timeout=3s CMD curl -f http://localhost:9876/health || exit 1

‎Jenkinsfile

Lines changed: 38 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,48 @@ pipeline {
55
}
66
agent any
77
environment {
8-
IMAGE_NAME = "nginx-proxy-manager"
9-
TEMP_IMAGE_NAME = "nginx-proxy-manager-build_${BUILD_NUMBER}"
10-
TAG_VERSION = getPackageVersion()
8+
IMAGE_NAME = "nginx-proxy-manager"
9+
TEMP_IMAGE_NAME = "nginx-proxy-manager-build_${BUILD_NUMBER}"
10+
TEMP_IMAGE_NAME_ARM = "nginx-proxy-manager-arm-build_${BUILD_NUMBER}"
11+
TAG_VERSION = getPackageVersion()
1112
}
1213
stages {
1314
stage('Prepare') {
1415
steps {
15-
sh 'docker pull jc21/$IMAGE_NAME-base'
16-
sh 'docker pull jc21/node'
1716
sh 'docker pull $DOCKER_CI_TOOLS'
1817
}
1918
}
20-
stage('Build') {
19+
stage('Build x86_64') {
2120
steps {
22-
sh 'docker run --rm -v $(pwd):/srv/app -w /srv/app jc21/node yarn --registry=$NPM_REGISTRY install'
23-
sh 'docker run --rm -v $(pwd):/srv/app -w /srv/app jc21/node npm run-script 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 --squash --compress -t $TEMP_IMAGE_NAME .'
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 run-script 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 /usr/bin/qemu-arm-static yarn --registry=$NPM_REGISTRY install'
35+
sh 'docker run --rm -v $(pwd):/srv/app -w /srv/app jc21/node:armhf /usr/bin/qemu-arm-static 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 /usr/bin/qemu-arm-static 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+
}
2841
}
2942
}
3043
stage('Publish Private') {
3144
steps {
3245
sh 'docker tag $TEMP_IMAGE_NAME ${DOCKER_PRIVATE_REGISTRY}/$IMAGE_NAME:$TAG_VERSION'
3346
sh 'docker push ${DOCKER_PRIVATE_REGISTRY}/$IMAGE_NAME:$TAG_VERSION'
47+
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'
3450
}
3551
}
3652
stage('Publish Public') {
@@ -43,10 +59,16 @@ pipeline {
4359
sh 'docker tag $TEMP_IMAGE_NAME docker.io/jc21/$IMAGE_NAME:latest'
4460
sh 'docker tag $TEMP_IMAGE_NAME docker.io/jc21/$IMAGE_NAME:$TAG_VERSION'
4561

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'
64+
4665
withCredentials([usernamePassword(credentialsId: 'jc21-dockerhub', passwordVariable: 'dpass', usernameVariable: 'duser')]) {
4766
sh "docker login -u '${duser}' -p '${dpass}'"
4867
sh 'docker push docker.io/jc21/$IMAGE_NAME:latest'
4968
sh 'docker push docker.io/jc21/$IMAGE_NAME:$TAG_VERSION'
69+
70+
sh 'docker push docker.io/jc21/$IMAGE_NAME:latest-armhf'
71+
sh 'docker push docker.io/jc21/$IMAGE_NAME:$TAG_VERSION-armhf'
5072
}
5173
}
5274
}
@@ -58,10 +80,12 @@ pipeline {
5880
sh 'docker tag $TEMP_IMAGE_NAME ${DOCKER_PRIVATE_REGISTRY}/$IMAGE_NAME:preview'
5981
sh 'docker push ${DOCKER_PRIVATE_REGISTRY}/$IMAGE_NAME:preview'
6082
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'
6184

6285
withCredentials([usernamePassword(credentialsId: 'jc21-dockerhub', passwordVariable: 'dpass', usernameVariable: 'duser')]) {
6386
sh "docker login -u '${duser}' -p '${dpass}'"
6487
sh 'docker push docker.io/jc21/$IMAGE_NAME:preview'
88+
sh 'docker push docker.io/jc21/$IMAGE_NAME:preview-armhf'
6589
}
6690
}
6791
}
@@ -79,7 +103,8 @@ pipeline {
79103
sh 'figlet "FAILURE"'
80104
}
81105
always {
82-
sh 'docker rmi $TEMP_IMAGE_NAME'
106+
sh 'docker rmi $TEMP_IMAGE_NAME'
107+
sh 'docker rmi $TEMP_IMAGE_NAME_ARM'
83108
}
84109
}
85110
}

0 commit comments

Comments
 (0)