p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,307 Commits 2 Branches 295 Tags
9cb45952e04746ea0ec7c19ec1e2e2ac4eefd986
Commit Graph

30 Commits

Author SHA1 Message Date
Vincent Demeester
29eec9aad7 Remove unmaintained Dockerfile syntax for Kate 
We don't support this and no maintainers uses Kate.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: a2f695d7fae47481eba68b92b33257605e4cbada
Component: engine
 2016-10-25 15:42:27 -07:00
Sebastiaan van Stijn
363b704890 Update Dockerfile highlight definitions 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 4cb71f80823af345d063cf0ad657e73ce9caa75f
Component: engine
 2016-06-05 17:45:21 +02:00
Koichi Shiraishi
64c61da51a Add ARG instruction syntax for vim 
Signed-off-by: Koichi Shiraishi <k@zchee.io>
Upstream-commit: b15247868cf736eedb28234875508d9160a1052f
Component: engine
 2016-01-20 15:08:45 +09:00
Asbjørn Enge
2d427f2dc5 Added ARG instruction and aligned with src repo 
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)
Upstream-commit: 8d7459140701006fb8e3a0550872ce55c43bcec0
Component: engine
 2015-11-05 10:56:07 +01:00
David Calavera
1e38e54eff Add STOPSIGNAL instruction to dockerfiles. 
This way, images creators can set the exit signal their programs use.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 3781cde61ff10b1d9114ae5b4c5c1d1b2c20a1ee
Component: engine
 2015-09-10 19:56:05 -04:00
Asbjørn Enge
77a149d3fd Various cleanups added to asbjornenge/Docker.tmbundle (by the TM maintainer) and support for the LABEL instruction 
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)
Upstream-commit: dfec4a48c7ac3ea4604b0a6d400109aa2004bad9
Component: engine
 2015-06-15 00:04:05 +02:00
Asbjørn Enge
c9ef6a3684 Updated TextMate install instruction - this bundle is not included in TM 😄 :rocket 
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)
Upstream-commit: ac8cbf4952cf745207dbd966109348bbb80c9ebd
Component: engine
 2015-06-15 00:02:10 +02:00
Mary Anthony
57eb64c9c0 Carry of PR #13520 
Removinig files

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: cd44018856be421497a35d96f88dd0eec42fae43
Component: engine
 2015-06-13 09:27:30 -07:00
Jessie Frazelle
7112e31245 Merge pull request #13604 from tianon/vim-embedded-shell 
Add embedded shell script highlight to vim syntax
Upstream-commit: 4d9191e15d457adaa9f7721828ee06cd6eb51b1d
Component: engine
 2015-05-29 14:17:07 -07:00
Tianon Gravi
4b65abde07 Adjust vim ftdetect to match "Dockerfile", "dockerfile", and "Dockerfile.*" which are all reasonably safe to assume "this is a Dockerfile" 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: e02744404d34027d1b358986bedd8557805aae58
Component: engine
 2015-05-29 13:46:51 -07:00
Tianon Gravi
b8a51baa80 Add embedded shell script highlight to vim syntax 
This highlights `RUN`, `CMD`, and `ENTRYPOINT` lines using shell highlighting.  It doesn't bother detecting the JSON forms, but that's OK because JSON arrays highlight pretty reasonably with shell highlights. :)

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 62d3b1bf2e830b6cdf7c4df86d356d48b58b1ab0
Component: engine
 2015-05-29 13:39:37 -07:00
Matt Bentley
90d074b59f Added nanorc for Dockerfiles 
Signed-off-by: Matt Bentley <matt@docker.com>
Upstream-commit: 76bc44fb912c66498b8e6e714ce4aabd9eaef8dc
Component: engine
 2015-05-06 12:41:11 -04:00
Eric Windisch
edf0b6037a Link to HTTPS urls in contrib comments/maintainers 
Updates comments and dockerfile maintainer lines
to use HTTPS urls where applicable.

Signed-off-by: Eric Windisch <eric@windisch.us>
Upstream-commit: df9ee6d6563ace6e382a3bdd4a45b38756a76afb
Component: engine
 2015-04-11 13:35:08 -04:00
Vincent Batts
d4497c7a2b .: remove trailing white spaces 
blame tibor this one ;-)
```
find . -type f -not -name '*.png' -not -name '*.go' -not -name '*.md'
-not -name '*.tar' -not -name '*.pem' -not -path './vendor/*' -not -path
'./.git/*' -not -path '*/testdata/*' -not -path './docs/*images*' -not
-path '*/testfiles/*' -not -path './bundles/*' -not -path
'./docs/*static*/*' -not -path './docs/*article-img/*' -exec grep -HnEl
'[[:space:]]$' {} \; | xargs sed -iE 's/[[:space:]]*$//'
```

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 7617ec176d266650b19c2378ccab4aa41e6dc5a2
Component: engine
 2015-03-25 13:38:17 -04:00
Dan Walsh
51b13a7774 Allow specification of Label Name/Value pairs in image json content 
Save "LABEL" field in Dockerfile into image content.

This will allow a user to save user data into an image, which
can later be retrieved using:

docker inspect IMAGEID

I have copied this from the "Comment" handling in docker images.

We want to be able to add Name/Value data to an image to describe the image,
and then be able to use other tools to look at this data, to be able to do
security checks based on this data.

We are thinking about adding version names,
Perhaps listing the content of the dockerfile.
Descriptions of where the code came from etc.

This LABEL field should also be allowed to be specified in the
docker import --change LABEL:Name=Value
docker commit --change LABEL:Name=Value

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: cdfdfbfb6223fdd5b319942d412caac6bc09cdeb
Component: engine
 2015-03-13 09:47:09 -07:00
Arnaud Porterie
5506a9a27c Remove subdirectories MAINTAINERS files 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 89bdaa35e04b74b7c6528783e0f7b8154b2a3d31
Component: engine
 2015-03-06 18:21:51 -08:00
Evan Carmi
bdbc984c7d Update syntax/vim README with Vundle instructions 
Signed-off-by: Evan Carmi <evan@ecarmi.org>
Upstream-commit: 8d1485bd3f1c1c8c94b8673ba818ed374fe10022
Component: engine
 2015-01-05 11:08:22 -08:00
James Turnbull
d3b31ca9dc Added Syntax highlighting file for the KDE Kate Editor 
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: 7458a82e0bbf4353729cfac3e1d7159b9d466161
Component: engine
 2014-08-27 11:16:51 -07:00
Asbjørn Enge
3174a5ef95 Added highlight for the COPY instruction 
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)
Upstream-commit: cb47ddd968747091fd1b3d408dd36c4c2086e69f
Component: engine
 2014-06-12 08:25:09 +02:00
German DZ
1097b506cc Instructions for Textmate's bundle installation 
Docker-DCO-1.1-Signed-off-by: German Del Zotto <germ@ndz.com.ar> (github: GermanDZ)
Upstream-commit: ac06646b1fb7172937c52d5f1217dcac5a86f0f9
Component: engine
 2014-02-07 09:30:11 +01:00
German DZ
4f66485afb New folder structure to support TextMate2 bundles format 
Docker-DCO-1.1-Signed-off-by: German Del Zotto <germ@ndz.com.ar> (github: GermanDZ)
Upstream-commit: f289b3a19e03b99a6618009320abaec2c0cf1ec1
Component: engine
 2014-02-07 09:29:14 +01:00
Tianon Gravi
e004860fa8 Merge pull request #3966 from asbjornenge/updated_tmlang 
Update TextMate & Sublime Text Syntaxt Highlighting with ONBUILD
Upstream-commit: 84285f7539f5825db62df3e3995d3de7b96b0a89
Component: engine
 2014-02-06 14:20:52 -07:00
Asbjørn Enge
b27e52cf64 Added support for single quoted strings 
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)
Upstream-commit: f6c6f303f84773987afd5f83d9c1e2170fa140e3
Component: engine
 2014-02-06 20:50:36 +01:00
Asbjørn Enge
f652ab5b5e Improved regex 
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)
Upstream-commit: 888e8da2832871b10f60ba9d3058fc442812ca17
Component: engine
 2014-02-06 20:48:15 +01:00
Asbjørn Enge
169c246340 Updated readme 
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)
Upstream-commit: 3d86f07f8776fd97f1f75e99ad535a9b6543059a
Component: engine
 2014-02-06 20:38:25 +01:00
Asbjørn Enge
94f2865699 Added suppport for the ONBUILD instruction 
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)
Upstream-commit: 647db3938d27d832d09f622b304c7bd23bc00d74
Component: engine
 2014-02-06 20:38:20 +01:00
Asbjørn Enge
a0b0e2b023 Removed the YAML file since I wasn't using it 
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)
Upstream-commit: e95bb0b4a9ef642d02f5549ba8375f9952eff0b3
Component: engine
 2014-02-06 20:37:49 +01:00
Asbjørn Enge
8a1a839738 Added Dockerfile.tmPreferences for hotkey commenting 
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)
Upstream-commit: 6561d65438ed2e10143a5a8bac32bf62d5d8950d
Component: engine
 2014-02-06 20:35:45 +01:00
Tianon Gravi
fc2d4abd37 Add "ONBUILD" highlighting to our vim syntax file 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: e634f2394085d5dc7e716553b330acb8694bf6d3
Component: engine
 2014-02-06 11:12:57 -07:00
Tianon Gravi
e302881b24 Reorganize the syntax highlighting files in contrib under a common directory to match "contrib/init" and "contrib/completion" 
This is split off from #2970.
Upstream-commit: 06a818616bfce86e90152aeaffaf9394a085c356
Component: engine
 2013-12-29 01:46:00 -07:00