Skip to content

Commit 76e67d6

Browse files
jumanjimanjumanjiman
committed
bump circleci builder image and pre-commit hooks; fix offensives
1 parent 11fb495 commit 76e67d6

File tree

8 files changed

+92
-31
lines changed

8 files changed

+92
-31
lines changed

Diff for: ‎.circleci/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ jobs:
55
build:
66
docker:
77
# https://github.com/jumanjihouse/cci/pulls?q=is%3Apr+is%3Aclosed
8-
- image: jumanjiman/cci:20180710T1802-git-9a2a87a
8+
- image: jumanjiman/cci:20190728T1749-git-4d9d481
99

1010
working_directory: ~/workdir/
1111

Diff for: ‎.mdlrc

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
################################################################################
2+
# Configuration file for markdownlint.
3+
#
4+
# https://github.com/markdownlint/markdownlint/blob/master/docs/configuration.md
5+
#
6+
# Order of preference for markdownlint config file (first one wins):
7+
# ${PWD}/.mdlrc
8+
# ${HOME}/.mdlrc
9+
################################################################################
10+
11+
# Use a custom style.
12+
style 'ci/jumanjistyle.rb'

Diff for: ‎.pre-commit-config.yaml

+11-5
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,32 @@ fail_fast: false
66

77
repos:
88
- repo: https://github.com/jumanjihouse/pre-commit-hooks
9-
rev: 1.8.0
9+
rev: 1.11.0
1010
hooks:
1111
- id: check-mailmap
1212
- id: forbid-binary
1313
exclude: ^assets/rubygems-workflow.png$
1414
- id: git-check # Configure in .gitattributes
1515
- id: git-dirty # Configure in .gitignore
16+
- id: markdownlint
17+
- id: require-ascii
18+
exclude: ^ci/ansi$
19+
- id: script-must-have-extension
20+
exclude: ^test/functions.bash$
21+
- id: script-must-not-have-extension
1622
- id: shellcheck
1723
exclude: ^ci/ansi$
1824
- id: shfmt
1925
exclude: ^ci/ansi$
2026

2127
- repo: https://github.com/adrienverge/yamllint.git
22-
rev: v1.11.1
28+
rev: v1.15.0
2329
hooks:
2430
- id: yamllint
2531
args: ['--format', 'parsable', '--strict']
2632

2733
- repo: https://github.com/pre-commit/pre-commit-hooks
28-
rev: v1.3.0
34+
rev: v2.1.0
2935
hooks:
3036
- id: check-added-large-files
3137
- id: check-case-conflict
@@ -37,7 +43,7 @@ repos:
3743
- id: detect-private-key
3844

3945
- repo: https://github.com/Lucas-C/pre-commit-hooks
40-
rev: v1.1.5
46+
rev: v1.1.6
4147
hooks:
4248
- id: forbid-crlf
4349
- id: forbid-tabs
@@ -48,7 +54,7 @@ repos:
4854
)
4955
5056
- repo: https://github.com/jorisroovers/gitlint
51-
rev: v0.10.0
57+
rev: v0.11.0
5258
hooks:
5359
- id: gitlint
5460
stages: [commit-msg]

Diff for: ‎README.md

+19-23
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
1-
hooktftp in a container!
2-
========================
1+
# hooktftp in a container
32

43
This source is used to build an image for
54
[hooktftp](https://github.com/tftp-go-team/hooktftp).
65

76
Project URL: [https://github.com/jumanjihouse/docker-hooktftp](https://github.com/jumanjihouse/docker-hooktftp)<br/>
87
Registry: [https://registry.hub.docker.com/u/jumanjiman/hooktftp/](https://registry.hub.docker.com/u/jumanjiman/hooktftp/)
98

10-
[![](https://images.microbadger.com/badges/image/jumanjiman/hooktftp.svg)](https://microbadger.com/images/jumanjiman/hooktftp "View on microbadger.com")&nbsp;
11-
[![](https://images.microbadger.com/badges/version/jumanjiman/hooktftp.svg)](https://microbadger.com/images/jumanjiman/hooktftp "View on microbadger.com")&nbsp;
12-
[![Docker Registry](https://img.shields.io/docker/pulls/jumanjiman/hooktftp.svg)](https://registry.hub.docker.com/u/jumanjiman/hooktftp 'View on docker hub')&nbsp;
13-
[![Circle CI](https://circleci.com/gh/jumanjihouse/docker-hooktftp.png?style=svg&circle-token=5bf142a4f054bf78f7abd3f9f2ab553d054de414)](https://circleci.com/gh/jumanjihouse/docker-hooktftp/tree/master 'View CI builds')
9+
[![](https://images.microbadger.com/badges/image/jumanjiman/hooktftp.svg)](https://microbadger.com/images/jumanjiman/hooktftp)&nbsp;
10+
[![](https://images.microbadger.com/badges/version/jumanjiman/hooktftp.svg)](https://microbadger.com/images/jumanjiman/hooktftp)&nbsp;
11+
[![Docker Registry](https://img.shields.io/docker/pulls/jumanjiman/hooktftp.svg)](https://registry.hub.docker.com/u/jumanjiman/hooktftp)&nbsp;
12+
[![Circle CI](https://circleci.com/gh/jumanjihouse/docker-hooktftp.png?style=svg&circle-token=5bf142a4f054bf78f7abd3f9f2ab553d054de414)](https://circleci.com/gh/jumanjihouse/docker-hooktftp/tree/master)
1413

1514
The primary artifact is a docker image with the `hooktftp` binary
1615
and a default, minimal configuration.
@@ -34,20 +33,19 @@ their infrastructure.
3433

3534
- [Build integrity and docker tags](#build-integrity-and-docker-tags)
3635
- [How-to](#how-to)
37-
- [Fetch an already-built image](#fetch-an-already-built-image)
38-
- [List files in the image](#list-files-in-the-image)
39-
- [Load NetFilter modules](#load-netfilter-modules)
40-
- [Configure and run](#configure-and-run)
41-
- [Use systemd for automatic startup](#use-systemd-for-automatic-startup)
42-
- [Build](#build)
43-
- [Test](#test)
44-
- [Publish to a private registry](#publish-to-a-private-registry)
36+
- [Fetch an already-built image](#fetch-an-already-built-image)
37+
- [List files in the image](#list-files-in-the-image)
38+
- [Load NetFilter modules](#load-netfilter-modules)
39+
- [Configure and run](#configure-and-run)
40+
- [Use systemd for automatic startup](#use-systemd-for-automatic-startup)
41+
- [Build](#build)
42+
- [Test](#test)
43+
- [Publish to a private registry](#publish-to-a-private-registry)
4544
- [Contribute](#contribute)
4645
- [License](#license)
4746

4847

49-
Build integrity and docker tags
50-
-------------------------------
48+
## Build integrity and docker tags
5149

5250
An unattended test harness runs the build script and acceptance tests.
5351
If all tests pass on master branch in the unattended test harness,
@@ -61,8 +59,7 @@ The CI scripts apply two tags before pushing to docker hub:
6159
Therefore you can `docker pull` a specific tag if you don't want *latest*.
6260

6361

64-
How-to
65-
------
62+
## How-to
6663

6764
### Fetch an already-built image
6865

@@ -165,7 +162,8 @@ On a docker host, run:
165162

166163
ci/test
167164

168-
You can also test via the docker remote API if you have configured a remote docker host:
165+
You can also test via the docker remote API
166+
if you have configured a remote docker host:
169167

170168
export DOCKER_HOST=tcp://<remote_ip>:<port>
171169
ci/build
@@ -234,13 +232,11 @@ You can push the built image to a private docker registry:
234232
docker push registry_id/your_id/hooktftp
235233

236234

237-
Contribute
238-
----------
235+
## Contribute
239236

240237
See [`CONTRIBUTING.md`](CONTRIBUTING.md) in this repo.
241238

242239

243-
License
244-
-------
240+
## License
245241

246242
See [`LICENSE`](LICENSE) in this repo.

Diff for: ‎ci/jumanjistyle.rb

+47
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
################################################################################
2+
# Style file for markdownlint.
3+
#
4+
# https://github.com/markdownlint/markdownlint/blob/master/docs/configuration.md
5+
#
6+
# This file is referenced by the project `.mdlrc`.
7+
################################################################################
8+
9+
#===============================================================================
10+
# Start with all built-in rules.
11+
# https://github.com/markdownlint/markdownlint/blob/master/docs/RULES.md
12+
all
13+
14+
#===============================================================================
15+
# Override default parameters for some built-in rules.
16+
# https://github.com/markdownlint/markdownlint/blob/master/docs/creating_styles.md#parameters
17+
18+
# Allow both fenced and indented code blocks.
19+
rule 'MD046', style: ['fenced', 'indented']
20+
21+
# Ignore line length in code blocks.
22+
rule 'MD013', code_blocks: false
23+
24+
#===============================================================================
25+
# Exclude the rules I disagree with.
26+
27+
# IMHO it's easier to read lists like:
28+
# * outmost indent
29+
# - one indent
30+
# - second indent
31+
# * Another major bullet
32+
exclude_rule 'MD004' # Unordered list style
33+
34+
# I prefer two blank lines before each heading.
35+
exclude_rule 'MD012' # Multiple consecutive blank lines
36+
37+
# I find it necessary to use '<br/>' to force line breaks.
38+
exclude_rule 'MD033' # Inline HTML
39+
40+
# If a page is printed, it helps if the URL is viewable.
41+
exclude_rule 'MD034' # Bare URL used
42+
43+
#===============================================================================
44+
# Exclude rules for pragmatic reasons.
45+
46+
# Either disable this one or MD024 - Multiple headers with the same content.
47+
exclude_rule 'MD036' # Emphasis used instead of a header

Diff for: ‎ci/test

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ set -o pipefail
88
. test/functions.bash
99

1010
info 'Run file checks.'
11-
run pre-commit run --all-files --verbose --hook-stage manual
11+
run pre-commit run --all-files --hook-stage manual
1212

1313
info "Clean up from previous test runs."
1414
cids="

Diff for: ‎src/alpine/builder/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ ARG HOOKTFTP_VERSION
3636
ENV HOOKTFTP_VERSION="${HOOKTFTP_VERSION}"
3737

3838
USER user
39-
RUN /home/user/build.sh
39+
RUN /home/user/build
4040

4141
################################################################################
4242
# Runtime image.

Diff for: ‎src/alpine/builder/build.sh renamed to ‎src/alpine/builder/build

File renamed without changes.

0 commit comments

Comments
 (0)