diff options
author | VirtualTam <virtualtam+github@flibidi.net> | 2018-06-20 16:59:29 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-20 16:59:29 +0200 |
commit | 6325e74caa464818000066b5112cfd293e168e50 (patch) | |
tree | 8c452980d8c7d6f98aa61e2d814377a1efc70fb3 /.gitattributes | |
parent | 26b0b2022870a540c1a6d54e949c4bdc1486daed (diff) | |
parent | c064d3179e0396983bdf8dee545388e4142ed842 (diff) | |
download | Shaarli-6325e74caa464818000066b5112cfd293e168e50.tar.gz Shaarli-6325e74caa464818000066b5112cfd293e168e50.tar.zst Shaarli-6325e74caa464818000066b5112cfd293e168e50.zip |
Merge pull request #1158 from virtualtam/master-dockerfile
Master: Build the Docker images from the local sources
Diffstat (limited to '.gitattributes')
-rw-r--r-- | .gitattributes | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes index 6b6ffbd5..9d22f11b 100644 --- a/.gitattributes +++ b/.gitattributes | |||
@@ -33,7 +33,9 @@ Dockerfile text | |||
33 | .travis.yml export-ignore | 33 | .travis.yml export-ignore |
34 | doc/**/*.json export-ignore | 34 | doc/**/*.json export-ignore |
35 | doc/**/*.md export-ignore | 35 | doc/**/*.md export-ignore |
36 | docker/ export-ignore | 36 | .docker/ export-ignore |
37 | .dockerignore export-ignore | ||
38 | Dockerfile* export-ignore | ||
37 | Doxyfile export-ignore | 39 | Doxyfile export-ignore |
38 | Makefile export-ignore | 40 | Makefile export-ignore |
39 | node_modules/ export-ignore | 41 | node_modules/ export-ignore |