Skip to content

Commit 67ea2d0

Browse files
jc21jc21
committed
Added gitter, contributors
1 parent dd2e335 commit 67ea2d0

File tree

2 files changed

+174
-66
lines changed

2 files changed

+174
-66
lines changed

‎Jenkinsfile

+43-54
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ pipeline {
55
options {
66
buildDiscarder(logRotator(numToKeepStr: '5'))
77
disableConcurrentBuilds()
8+
ansiColor('xterm')
89
}
910
environment {
1011
IMAGE = "nginx-proxy-manager"
@@ -55,50 +56,44 @@ pipeline {
5556
}
5657
stage('Frontend') {
5758
steps {
58-
ansiColor('xterm') {
59-
sh './scripts/frontend-build'
60-
}
59+
sh './scripts/frontend-build'
6160
}
6261
}
6362
stage('Backend') {
6463
steps {
65-
ansiColor('xterm') {
66-
echo 'Checking Syntax ...'
67-
// See: https://github.com/yarnpkg/yarn/issues/3254
68-
sh '''docker run --rm \\
69-
-v "$(pwd)/backend:/app" \\
70-
-w /app \\
71-
node:latest \\
72-
sh -c "yarn install && yarn eslint . && rm -rf node_modules"
73-
'''
64+
echo 'Checking Syntax ...'
65+
// See: https://github.com/yarnpkg/yarn/issues/3254
66+
sh '''docker run --rm \\
67+
-v "$(pwd)/backend:/app" \\
68+
-w /app \\
69+
node:latest \\
70+
sh -c "yarn install && yarn eslint . && rm -rf node_modules"
71+
'''
7472

75-
echo 'Docker Build ...'
76-
sh '''docker build --pull --no-cache --squash --compress \\
77-
-t "${IMAGE}:ci-${BUILD_NUMBER}" \\
78-
-f docker/Dockerfile \\
79-
--build-arg TARGETPLATFORM=linux/amd64 \\
80-
--build-arg BUILDPLATFORM=linux/amd64 \\
81-
--build-arg BUILD_VERSION="${BUILD_VERSION}" \\
82-
--build-arg BUILD_COMMIT="${BUILD_COMMIT}" \\
83-
--build-arg BUILD_DATE="$(date '+%Y-%m-%d %T %Z')" \\
84-
.
85-
'''
86-
}
73+
echo 'Docker Build ...'
74+
sh '''docker build --pull --no-cache --squash --compress \\
75+
-t "${IMAGE}:ci-${BUILD_NUMBER}" \\
76+
-f docker/Dockerfile \\
77+
--build-arg TARGETPLATFORM=linux/amd64 \\
78+
--build-arg BUILDPLATFORM=linux/amd64 \\
79+
--build-arg BUILD_VERSION="${BUILD_VERSION}" \\
80+
--build-arg BUILD_COMMIT="${BUILD_COMMIT}" \\
81+
--build-arg BUILD_DATE="$(date '+%Y-%m-%d %T %Z')" \\
82+
.
83+
'''
8784
}
8885
}
8986
stage('Test') {
9087
steps {
91-
ansiColor('xterm') {
92-
// Bring up a stack
93-
sh 'docker-compose up -d fullstack'
94-
sh './scripts/wait-healthy $(docker-compose ps -q fullstack) 120'
88+
// Bring up a stack
89+
sh 'docker-compose up -d fullstack'
90+
sh './scripts/wait-healthy $(docker-compose ps -q fullstack) 120'
9591

96-
// Run tests
97-
sh 'rm -rf test/results'
98-
sh 'docker-compose up cypress'
99-
// Get results
100-
sh 'docker cp -L "$(docker-compose ps -q cypress):/results" test/'
101-
}
92+
// Run tests
93+
sh 'rm -rf test/results'
94+
sh 'docker-compose up cypress'
95+
// Get results
96+
sh 'docker cp -L "$(docker-compose ps -q cypress):/results" test/'
10297
}
10398
post {
10499
always {
@@ -121,18 +116,16 @@ pipeline {
121116
}
122117
}
123118
steps {
124-
ansiColor('xterm') {
125-
dir(path: 'docs') {
126-
sh 'yarn install'
127-
sh 'yarn build'
128-
}
129-
130-
dir(path: 'docs/.vuepress/dist') {
131-
sh 'tar -czf ../../docs.tgz *'
132-
}
119+
dir(path: 'docs') {
120+
sh 'yarn install'
121+
sh 'yarn build'
122+
}
133123

134-
archiveArtifacts(artifacts: 'docs/docs.tgz', allowEmptyArchive: false)
124+
dir(path: 'docs/.vuepress/dist') {
125+
sh 'tar -czf ../../docs.tgz *'
135126
}
127+
128+
archiveArtifacts(artifacts: 'docs/docs.tgz', allowEmptyArchive: false)
136129
}
137130
}
138131
stage('MultiArch Build') {
@@ -142,12 +135,10 @@ pipeline {
142135
}
143136
}
144137
steps {
145-
ansiColor('xterm') {
146-
withCredentials([usernamePassword(credentialsId: 'jc21-dockerhub', passwordVariable: 'dpass', usernameVariable: 'duser')]) {
147-
sh "docker login -u '${duser}' -p '${dpass}'"
148-
// Buildx with push
149-
sh "./scripts/buildx --push ${BUILDX_PUSH_TAGS}"
150-
}
138+
withCredentials([usernamePassword(credentialsId: 'jc21-dockerhub', passwordVariable: 'dpass', usernameVariable: 'duser')]) {
139+
sh "docker login -u '${duser}' -p '${dpass}'"
140+
// Buildx with push
141+
sh "./scripts/buildx --push ${BUILDX_PUSH_TAGS}"
151142
}
152143
}
153144
}
@@ -193,10 +184,8 @@ pipeline {
193184
}
194185
}
195186
steps {
196-
ansiColor('xterm') {
197-
script {
198-
def comment = pullRequest.comment("Docker Image for build ${BUILD_NUMBER} is available on [DockerHub](https://cloud.docker.com/repository/docker/jc21/${IMAGE}) as `jc21/${IMAGE}:github-${BRANCH_LOWER}`")
199-
}
187+
script {
188+
def comment = pullRequest.comment("Docker Image for build ${BUILD_NUMBER} is available on [DockerHub](https://cloud.docker.com/repository/docker/jc21/${IMAGE}) as `jc21/${IMAGE}:github-${BRANCH_LOWER}`")
200189
}
201190
}
202191
}

‎README.md

+131-12
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
<p align="center">
2-
<img src="https://nginxproxymanager.com/github.png">
3-
<br><br>
4-
<img src="https://img.shields.io/badge/version-2.2.4-green.svg?style=for-the-badge">
5-
<a href="https://hub.docker.com/repository/docker/jc21/nginx-proxy-manager">
6-
<img src="https://img.shields.io/docker/stars/jc21/nginx-proxy-manager.svg?style=for-the-badge">
7-
</a>
8-
<a href="https://hub.docker.com/repository/docker/jc21/nginx-proxy-manager">
9-
<img src="https://img.shields.io/docker/pulls/jc21/nginx-proxy-manager.svg?style=for-the-badge">
10-
</a>
11-
<a href="https://ci.nginxproxymanager.com/blue/organizations/jenkins/nginx-proxy-manager/branches/">
12-
<img src="https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fci.nginxproxymanager.com%2Fjob%2Fnginx-proxy-manager%2Fjob%2Fmaster&style=for-the-badge">
13-
</a>
2+
<img src="https://nginxproxymanager.com/github.png">
3+
<br><br>
4+
<img src="https://img.shields.io/badge/version-2.2.4-green.svg?style=for-the-badge">
5+
<a href="https://hub.docker.com/repository/docker/jc21/nginx-proxy-manager">
6+
<img src="https://img.shields.io/docker/stars/jc21/nginx-proxy-manager.svg?style=for-the-badge">
7+
</a>
8+
<a href="https://hub.docker.com/repository/docker/jc21/nginx-proxy-manager">
9+
<img src="https://img.shields.io/docker/pulls/jc21/nginx-proxy-manager.svg?style=for-the-badge">
10+
</a>
11+
<a href="https://ci.nginxproxymanager.com/blue/organizations/jenkins/nginx-proxy-manager/branches/">
12+
<img src="https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fci.nginxproxymanager.com%2Fjob%2Fnginx-proxy-manager%2Fjob%2Fmaster&style=for-the-badge">
13+
</a>
14+
<a href="https://gitter.im/nginx-proxy-manager/community">
15+
<img alt="Gitter" src="https://img.shields.io/gitter/room/nginx-proxy-manager/community?style=for-the-badge">
16+
</a>
1417
</p>
1518

1619
This project comes as a pre-built docker image that enables you to easily forward to your websites
@@ -48,3 +51,119 @@ I won't go in to too much detail here but here are the basics for someone new to
4851
2. Add port forwarding for port 80 and 443 to the server hosting this project
4952
3. Configure your domain name details to point to your home, either with a static ip or a service like DuckDNS or [Amazon Route53](https://github.com/jc21/route53-ddns)
5053
4. Use the Nginx Proxy Manager as your gateway to forward to your other web based services
54+
55+
56+
## Contributors
57+
58+
Special thanks to the following contributors:
59+
60+
<!-- prettier-ignore-start -->
61+
<!-- markdownlint-disable -->
62+
<table>
63+
<tr>
64+
<td align="center">
65+
<a href="https://github.com/Subv">
66+
<img src="https://avatars1.githubusercontent.com/u/357072?s=460&u=d8adcdc91d749ae53e177973ed9b6bb6c4c894a3&v=4" width="80px;" alt=""/>
67+
<br /><sub><b>Sebastian Valle</b></sub>
68+
</a>
69+
</td>
70+
<td align="center">
71+
<a href="https://github.com/Indemnity83">
72+
<img src="https://avatars3.githubusercontent.com/u/35218?s=460&u=7082004ff35138157c868d7d9c683ccebfce5968&v=4" width="80px;" alt=""/>
73+
<br /><sub><b>Kyle Klaus</b></sub>
74+
</a>
75+
</td>
76+
<td align="center">
77+
<a href="https://github.com/theraw">
78+
<img src="https://avatars1.githubusercontent.com/u/32969774?s=460&u=6b359971e15685fb0359e6a8c065a399b40dc228&v=4" width="80px;" alt=""/>
79+
<br /><sub><b>ƬHE ЯAW</b></sub>
80+
</a>
81+
</td>
82+
<td align="center">
83+
<a href="https://github.com/spalger">
84+
<img src="https://avatars2.githubusercontent.com/u/1329312?s=400&u=565223e38f1c052afb4c5dcca3fcf1c63ba17ae7&v=4" width="80px;" alt=""/>
85+
<br /><sub><b>Spencer</b></sub>
86+
</a>
87+
</td>
88+
<td align="center">
89+
<a href="https://github.com/Xantios">
90+
<img src="https://avatars3.githubusercontent.com/u/1507836?s=460&v=4" width="80px;" alt=""/>
91+
<br /><sub><b>Xantios Krugor</b></sub>
92+
</a>
93+
</td>
94+
</tr>
95+
<tr>
96+
<td align="center">
97+
<a href="https://github.com/dpanesso">
98+
<img src="https://avatars2.githubusercontent.com/u/2687121?s=460&v=4" width="80px;" alt=""/>
99+
<br /><sub><b>David Panesso</b></sub>
100+
</a>
101+
</td>
102+
<td align="center">
103+
<a href="https://github.com/IronTooch">
104+
<img src="https://avatars3.githubusercontent.com/u/27360514?s=460&u=69bf854a6647c55725f62ecb8d39249c6c0b2602&v=4" width="80px;" alt=""/>
105+
<br /><sub><b>IronTooch</b></sub>
106+
</a>
107+
</td>
108+
<td align="center">
109+
<a href="https://github.com/damianog">
110+
<img src="https://avatars1.githubusercontent.com/u/2786682?s=460&u=76c6136fae797abb76b951cd8a246dcaecaf21af&v=4" width="80px;" alt=""/>
111+
<br /><sub><b>Damiano</b></sub>
112+
</a>
113+
</td>
114+
<td align="center">
115+
<a href="https://github.com/tfmm">
116+
<img src="https://avatars3.githubusercontent.com/u/6880538?s=460&u=ce0160821cc4aa802df8395200f2d4956a5bc541&v=4" width="80px;" alt=""/>
117+
<br /><sub><b>Russ</b></sub>
118+
</a>
119+
</td>
120+
<td align="center">
121+
<a href="https://github.com/margaale">
122+
<img src="https://avatars3.githubusercontent.com/u/20794934?s=460&v=4" width="80px;" alt=""/>
123+
<br /><sub><b>Marcelo Castagna</b></sub>
124+
</a>
125+
</td>
126+
</tr>
127+
<tr>
128+
<td align="center">
129+
<a href="https://github.com/Steven-Harris">
130+
<img src="https://avatars2.githubusercontent.com/u/7720242?s=460&v=4" width="80px;" alt=""/>
131+
<br /><sub><b>Steven Harris</b></sub>
132+
</a>
133+
</td>
134+
<td align="center">
135+
<a href="https://github.com/jlesage">
136+
<img src="https://avatars0.githubusercontent.com/u/1791123?s=460&v=4" width="80px;" alt=""/>
137+
<br /><sub><b>Jocelyn Le Sage</b></sub>
138+
</a>
139+
</td>
140+
<td align="center">
141+
<a href="https://github.com/cmer">
142+
<img src="https://avatars0.githubusercontent.com/u/412?s=460&u=67dd8b2e3661bfd6f68ec1eaa5b9821bd8a321cd&v=4" width="80px;" alt=""/>
143+
<br /><sub><b>Carl Mercier</b></sub>
144+
</a>
145+
</td>
146+
<td align="center">
147+
<a href="https://github.com/the1ts">
148+
<img src="https://avatars1.githubusercontent.com/u/84956?s=460&v=4" width="80px;" alt=""/>
149+
<br /><sub><b>Paul Mansfield</b></sub>
150+
</a>
151+
</td>
152+
<td align="center">
153+
<a href="https://github.com/OhHeyAlan">
154+
<img src="https://avatars0.githubusercontent.com/u/11955126?s=460&u=fbaa5a1a4f73ef8960132c703349bfd037fe2630&v=4" width="80px;" alt=""/>
155+
<br /><sub><b>OhHeyAlan</b></sub>
156+
</a>
157+
</td>
158+
</tr>
159+
<tr>
160+
<td align="center">
161+
<a href="https://github.com/dogmatic69">
162+
<img src="https://avatars2.githubusercontent.com/u/94674?s=460&u=ca7647de53145c6283b6373ade5dc94ba99347db&v=4" width="80px;" alt=""/>
163+
<br /><sub><b>Carl Sutton</b></sub>
164+
</a>
165+
</td>
166+
</tr>
167+
</table>
168+
<!-- markdownlint-enable -->
169+
<!-- prettier-ignore-end -->

0 commit comments

Comments
 (0)