Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
S
secondary-dns-docker
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
shore
secondary-dns-docker
Commits
5b20a450
Commit
5b20a450
authored
4 years ago
by
nimrod
Browse files
Options
Downloads
Plain Diff
Merge branch 'ci-template'
parents
7173aa6b
93d67592
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Pipeline
#566
passed
4 years ago
Stage: test
Stage: build
Stage: deploy
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.env
+1
-0
1 addition, 0 deletions
.env
.gitlab-ci.yml
+10
-37
10 additions, 37 deletions
.gitlab-ci.yml
.pre-commit-config.yaml
+28
-14
28 additions, 14 deletions
.pre-commit-config.yaml
README.md
+6
-4
6 additions, 4 deletions
README.md
with
45 additions
and
55 deletions
.env
0 → 100644
+
1
−
0
View file @
5b20a450
COMPOSE_PROJECT_NAME=secondary_dns
This diff is collapsed.
Click to expand it.
.gitlab-ci.yml
+
10
−
37
View file @
5b20a450
---
image
:
adarnimrod/ci-images:docker
include
:
-
project
:
shore/ci-templates
file
:
templates/pre-commit.yml
-
project
:
shore/ci-templates
file
:
templates/docker.yml
stages
:
-
test
-
build
-
run
pre-commit
:
stage
:
test
image
:
adarnimrod/ci-images:pre-commit
variables
:
XDG_CACHE_HOME
:
"
$CI_PROJECT_DIR/.cache"
# Disabled until https://github.com/pre-commit/pre-commit/issues/1387 is
# resolved.
SKIP
:
"
hadolint,docker-compose"
script
:
-
pre-commit run --all-files
cache
:
paths
:
-
.cache/
-
deploy
build
:
stage
:
build
tags
:
[
"
ns4.shore.co.il"
]
variables
:
COMPOSE_DOCKER_CLI_BUILD
:
"
1"
DOCKER_BUILDKIT
:
"
1"
script
:
-
docker-compose build --no-cache --pull
-
docker-compose pull --quiet
extends
:
.compose-build
tags
:
[
ns4.shore.co.il
]
run
:
stage
:
run
tags
:
[
"
ns4.shore.co.il"
]
when
:
manual
script
:
-
docker-compose up --detach --remove-orphans
# yamllint disable rule:line-length
-
|
for i in $(seq 12)
do
docker container inspect --format '{{ .State.Health.Status }}' $(docker-compose ps -q) | grep -v '^healthy$' || break
sleep 10
done
! docker container inspect --format '{{ .State.Health.Status }}' $(docker-compose ps -q) | grep -v '^healthy$'
extends
:
.compose-run
tags
:
[
ns4.shore.co.il
]
This diff is collapsed.
Click to expand it.
.pre-commit-config.yaml
+
28
−
14
View file @
5b20a450
# vim:ff=unix ts=2 sw=2 ai expandtab
---
repos
:
-
repo
:
https://github.com/pre-commit/pre-commit-hooks
rev
:
v
2.3
.0
-
repo
:
https://github.com/pre-commit/pre-commit-hooks
.git
rev
:
v
3.4
.0
hooks
:
-
id
:
check-added-large-files
-
id
:
check-executables-have-shebangs
-
id
:
check-merge-conflict
-
id
:
detect-private-key
-
id
:
check-symlinks
-
id
:
trailing-whitespace
-
repo
:
https://github.com/Yelp/detect-secrets
rev
:
v0.14.3
hooks
:
-
id
:
detect-secrets
-
repo
:
https://github.com/adrienverge/yamllint
rev
:
v1.
17
.0
rev
:
v1.
25
.0
hooks
:
-
id
:
yamllint
-
repo
:
https://github.com/amperser/proselint/
rev
:
0.10.2
hooks
:
-
id
:
proselint
types
:
[
plain-text
]
exclude
:
LICENSE
-
repo
:
https://github.com/Yelp/detect-secrets
rev
:
v0.13.0
hooks
:
-
id
:
detect-secrets
-
repo
:
https://git.shore.co.il/nimrod/docker-pre-commit.git/
rev
:
v0.3.0
-
repo
:
https://github.com/executablebooks/mdformat.git
rev
:
0.5.3
hooks
:
-
id
:
docker-compose
-
id
:
hadolint
-
repo
:
https://git.shore.co.il/nimrod/shell-pre-commit.git
/
-
id
:
mdformat
-
repo
:
https://git.shore.co.il/nimrod/shell-pre-commit.git
rev
:
v0.6.0
hooks
:
-
id
:
shell-lint
-
repo
:
https://github.com/shellcheck-py/shellcheck-py.git
rev
:
v0.7.1.1
hooks
:
-
id
:
shellcheck
-
repo
:
https://git.shore.co.il/nimrod/docker-pre-commit.git/
rev
:
v0.3.0
hooks
:
-
id
:
hadolint
-
id
:
docker-compose
This diff is collapsed.
Click to expand it.
README.md
+
6
−
4
View file @
5b20a450
# Secondary DNS server
[

](https://git.shore.co.il/shore/secondary-dns-docker/-/commits/master)
> Secondary DNS server Docker image.
## License
...
...
@@ -8,7 +10,7 @@ This software is licensed under the MIT license (see `LICENSE.txt`).
## Author Information
Nimrod Adar,
[
contact me
](
mailto:nimrod@shore.co.il
)
or visit my
[
website
](
https://www.shore.co.il/
)
. Patches are welcome via
[
`git send-email`
](
http://git-scm.com/book/en/v2/Git-Commands-Email
)
. The repository
is located
at:
<https://www.shore.co.il/git/>
.
Nimrod Adar,
[
contact me
](
mailto:nimrod@shore.co.il
)
or visit my
[
website
](
https://www.shore.co.il/
)
. Patches are welcome via
[
`git send-email`
](
http://git-scm.com/book/en/v2/Git-Commands-Email
)
. The repository
is located
at:
<https://www.shore.co.il/git/>
.
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment