p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #11112 from tianon/bashrc-for-tibor-♥

Browse Source 
Add support for an optional ".bashrc" file
Upstream-commit: 360adc707b6ec2023178ed95befeb5514e530ca3
Component: engine
This commit is contained in:
Tibor Vass
2015-03-02 13:02:39 -05:00
parent 8ccc0c87e2 0a09f8ffe0
commit dcdf67a6ec
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
components/engine/.gitignore vendored
View File

@ -30,3 +30,4 @@ docs/VERSION
docs/GITCOMMIT
docs/changed-files
autogen/
.bashrc

3
components/engine/Dockerfile
View File

@ -142,6 +142,9 @@ VOLUME /var/lib/docker
WORKDIR /go/src/github.com/docker/docker
ENV DOCKER_BUILDTAGS apparmor selinux btrfs_noversion
# Let us use a .bashrc file
RUN ln -sfv $PWD/.bashrc ~/.bashrc
# Install man page generator
COPY vendor /go/src/github.com/docker/docker/vendor
# (copy vendor/ because go-md2man needs golang.org/x/net)