Commit Graph

58 Commits

Author SHA1 Message Date
zhangguanzhang 74e01d6ccd Fixes: https://github.com/containers/podman/issues/7790
if they are the same and dest is a directory, should error like cp behavior

Signed-off-by: zhangguanzhang <zhangguanzhang@qq.com>
2020-10-06 11:39:51 +08:00
dependabot-preview[bot] e744609919
Bump github.com/Microsoft/hcsshim from 0.8.6 to 0.8.7
Bumps [github.com/Microsoft/hcsshim](https://github.com/Microsoft/hcsshim) from 0.8.6 to 0.8.7.
- [Release notes](https://github.com/Microsoft/hcsshim/releases)
- [Commits](https://github.com/Microsoft/hcsshim/compare/v0.8.6...v0.8.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2019-12-03 15:14:30 +01:00
Sascha Grunert 66c879f02a
Switch to golangci-lint
This commit uses internal tools vendoring to switch to golangci-lint. All
working linters have been enabled. The other tools have been vendored as
well into the same tools folder, whereas the corresponding test and
build targets have been adapted as well.

Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2019-07-17 11:13:06 +02:00
Chris Evich d4532a8086
Only ignore container-storage in root
Previously, git was ignoring the pattern 'container-storage' everywhere.
Since changes to `cmd/container-storage` may be desirable, anchor the
pattern to the repo root only.

Signed-off-by: Chris Evich <cevich@redhat.com>
2019-05-16 16:41:01 -04:00
Daniel J Walsh f39066fe1b Update packages to match latest code in moby/pkg
Had to vendor in a new version of golang.org/x/net to build
Also had to make some changes to drivers to handle
archive.Reader -> io.Reader
archive.Archive -> io.ReadCloser

Also update .gitingore to ignore emacs files, containers-storage.*
and generated man pages.

Also no longer test travis against golang 1.7, cri-o, moby have also
done this.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2017-09-12 18:00:29 +00:00
Nalin Dahyabhai 230b9ab91a Replace the build system
Replace the bundle-targeted build system with simpler Makefile targets
and fewer helper scripts.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2017-05-25 15:50:33 -04:00
Erik Hollensbe 3ef4b6f571 add storageversion/version_autogen to .gitignore
Signed-off-by: Erik Hollensbe <github@hollensbe.org>
2017-01-30 08:45:07 -08:00
Erik Hollensbe 43d0f5defa Add .vagrant to .gitignore
Signed-off-by: Erik Hollensbe <github@hollensbe.org>
2017-01-30 08:43:50 -08:00
John Howard 0c7eab3157 Make dockerd debuggable
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-04-26 09:35:22 -07:00
Harald Albers 8850b223ed re-add .bashrc to .gitignore
.bashrc was removed in 29fbc9cc1d
but is still needed. It serves as a hook to customize the build environment.

Signed-off-by: Harald Albers <github@albersweb.de>
2016-03-24 18:43:41 +01:00
Alexander Morozov 29fbc9cc1d gitignore: cleanup some not needed entries
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-03-15 07:33:05 -07:00
Antonio Murdaca fa7d676891 .gitignore: do not ignore *.rej
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-12-18 17:12:54 +01:00
Vincent Demeester 8054a30387 dockerversion placeholder for library import
- Add a *version* file placeholder.
- Update autogen and builds to use it and an autogen build flag

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-11-09 19:32:46 +01:00
Brian Goff b78ca243d9 Revert "dockerversion placeholder for library-import"
This reverts commit d5cd032a86.

Commit caused issues on systems with case-insensitive filesystems.
Revert for now

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-10-27 21:23:53 -04:00
Vincent Demeester d5cd032a86 dockerversion placeholder for library-import
- Move autogen/dockerversion to version
- Update autogen and "builds" to use this package and a build flag

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-10-27 20:36:07 +01:00
Jessica Frazelle cf8688c235
ignore man8
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-10-01 10:05:51 -07:00
John Howard c1b524486c Fix Windows CI fail due to GH13866 and patch up tests
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-07-09 10:09:45 -07:00
Ankush Agarwal b0f7a1c62c Removing .idea from .gitignore
The project cannot include every editor's
ignore files. Contributers can use a local
global gitignore : https://help.github.com/articles/ignoring-files

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
2015-07-06 10:41:38 -07:00
Jessica Frazelle f88e620359 update gitignore for new manpages
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-06-10 16:11:15 -07:00
Chen Hanxiao 3957cc8022 gitignore: add *.rej
Ignore noise from unsuccessful patch operation.

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
2015-05-13 22:10:26 -04:00
Arnaud Porterie 4433b4c19e Sort .gitignore content
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-03-24 09:40:07 -07:00
Tianon Gravi c62230a879 Add support for an optional ".bashrc" file
If `.bashrc` exists at the root of the source tree, it will be used as the `~/.bashrc` inside the container.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-03-02 10:33:26 -07:00
Srini Brahmaroutu 6871b9b16a Removing -X flag option and autogenerated code to create Dockerversion.go functionality
Addresses #9207

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-02-20 05:40:12 +00:00
Jessica Frazelle a6a748b9a0 Update docs release script so we can have autodeploys
to docs.master.dockerproject.com.

- Make the invaidation profile the bucket variable, not hard coded.
- Add no cache variable for settings cache to "no-cache"

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2015-01-12 09:56:43 -08:00
Ahmet Alp Balkan b7703a992e Add windows/(386,amd64) to cross platforms list
Edited make scripts to append .exe to windows binary

Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com>
2014-11-14 18:20:54 -08:00
Jessica Frazelle 17e0a15386 Revert "Use code generation to set IAMSTATIC instead of -X"
This reverts commit 3e10b93106.

Conflicts:
	.gitignore
	hack/make.sh
	hack/make/dynbinary

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-28 16:25:50 -07:00
Michael Hudson-Doyle c7c620dd9f finally, use code generation for INITSHA1 & INITPATH too
Signed-off-by: Michael Hudson-Doyle <michael.hudson@linaro.org>
2014-10-24 11:01:19 +13:00
Michael Hudson-Doyle 85744a35de use code generation for GITCOMMIT/VERSION too
Signed-off-by: Michael Hudson-Doyle <michael.hudson@linaro.org>
2014-10-24 10:58:39 +13:00
Michael Hudson-Doyle 3e10b93106 Use code generation to set IAMSTATIC instead of -X
Signed-off-by: Michael Hudson-Doyle <michael.hudson@linaro.org>
2014-10-24 10:56:51 +13:00
Victor Vieux 170ba7f8fe update release checklist and .gitignore
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-07-02 18:54:14 +00:00
O.S.Tezer d9f9021e9b Docs: Add docs new version files created by `make docs` to .gitignore
Files are:

 - docs/AWS_S3_BUCKET
 - docs/GIT_BRANCH
 - docs/VERSION

Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)

Update:

 - Remove unnecessary last blankline
2014-04-24 13:33:00 +03:00
unclejack 67d55860a5 Remove Vagrantfile and remove it from all docs
This removes the Vagrantfile and updates the documentation to remove
the steps which explain how to install Docker in a VM via Vagrant.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-02-22 03:25:32 +02:00
Sven Dowideit 7b95d41092 tell anyone that might want to ignore their editor choice's backup files that there is a better way - thanks @pnasrat 2013-11-27 13:19:06 +10:00
Daniel Mizyrycki 249f76bebd docker-ci 0.4.5: Sync tests with progress in docker and docker-registry. Use revamped shiny DinD. 2013-11-06 20:05:26 -08:00
Tianon Gravi 4870265a9f Add "vendor/pkg/" to .gitignore now that we "go test -i" 2013-10-18 12:18:13 -06:00
Solomon Hykes 45cedefadb hack/vendor.sh: overwrite existing dependencies and remove .git so they can be checked in 2013-09-11 18:38:09 -07:00
Brandon Philips 19dc3b0792 gitignore: ignore bundles directory 2013-09-07 17:35:49 -07:00
Wes Morgan 20d24a450c move deps installation to vendor.sh script 2013-09-07 17:35:48 -07:00
Jonathan Rudenberg a43bae4c0b gitignore all test files 2013-08-10 13:48:24 -04:00
Andy Rothfusz ff964d327d Cleaning up the welcome page, terminology, and images. 2013-07-02 15:03:29 -07:00
Charles Hooper daa7e4a203 Merge pull request #184 from titanous/simplify-vagrant
vagrant: Simplify provisioning to build from repo
2013-03-27 19:07:20 -07:00
Jonathan Rudenberg a3ab89df2b vagrant: Simplify provisioning to build from repo
This sets up an idiomatic Go workspace in /opt/go with the source
shared from the host directory in
/opt/go/src/github.com/dotcloud/docker and docker installed into
/opt/go
2013-03-27 21:55:25 -04:00
Solomon Hykes d8dc6d4583 Merged branch sa2ajj/top-level-makefile 2013-03-27 11:50:01 -07:00
Mikhail Sobolev a57b37ed0e use .gopath/ instead of build/ 2013-03-26 17:19:57 +02:00
Mikhail Sobolev 7009d6c6dd introduce top-level Makefile to build the docker binary 2013-03-26 17:19:54 +02:00
Thatcher Peskens 69b09ccfc8 Merge of docker-website into the docker documentation. 2013-03-25 19:52:52 -07:00
creack 08cb430281 Move the debian makefile to avoid confusions 2013-03-22 04:34:46 -07:00
creack c72ff318d3 Integrate Auth in runtime and make the config file relative to runtime root 2013-03-22 02:19:39 -07:00
creack d8fa52b7b5 Comply the tests with golang TIP 2013-03-21 10:31:02 -07:00
Solomon Hykes bb5b7897a4 Merged branch 79-rmi_regexp-feature 2013-03-15 14:08:02 -07:00