This repository has been archived by the owner on Jan 22, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 24
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3 from thaJeztah/update-dockerfile-formatting
Update dockerfile formatting
- Loading branch information
Showing
3 changed files
with
17 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| from golang:1.5.3 | ||
| run apt-get update && apt-get install -y build-essential | ||
| run git clone -b v2_02_103 https://git.fedorahosted.org/git/lvm2.git /usr/local/lvm2 | ||
| run cd /usr/local/lvm2 \ | ||
| FROM golang:1.5.3 | ||
| RUN apt-get update && apt-get install -y build-essential | ||
| RUN git clone -b v2_02_103 https://git.fedorahosted.org/git/lvm2.git /usr/local/lvm2 | ||
| RUN cd /usr/local/lvm2 \ | ||
| && ./configure --enable-static_link \ | ||
| && make device-mapper \ | ||
| && make install_device-mapper | ||
|
|
||
| env GOPATH=/go:/go/src/github.com/docker/v1.10-migrator/Godeps/_workspace | ||
| copy . /go/src/github.com/docker/v1.10-migrator | ||
| run go install -tags libdm_no_deferred_remove --ldflags '-extldflags "-static"' github.com/docker/v1.10-migrator | ||
| ENV GOPATH=/go:/go/src/github.com/docker/v1.10-migrator/Godeps/_workspace | ||
| COPY . /go/src/github.com/docker/v1.10-migrator | ||
| RUN go install -tags libdm_no_deferred_remove --ldflags '-extldflags "-static"' github.com/docker/v1.10-migrator |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| from busybox | ||
| add v1.10-migrator /bin | ||
| entrypoint /bin/v1.10-migrator | ||
| FROM busybox | ||
| ADD v1.10-migrator /bin | ||
| ENTRYPOINT /bin/v1.10-migrator |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,13 @@ | ||
| from debian:jessie | ||
| run apt-get update && apt-get install -y wget iptables git btrfs-tools | ||
| FROM debian:jessie | ||
| RUN apt-get update && apt-get install -y wget iptables git btrfs-tools | ||
|
|
||
| # install bats | ||
| run cd /usr/local/src/ \ | ||
| RUN cd /usr/local/src/ \ | ||
| && git clone https://github.com/sstephenson/bats.git \ | ||
| && cd bats \ | ||
| && ./install.sh /usr/local | ||
|
|
||
| volume /var/lib/docker | ||
| add pre-tests.bats entrypoint.sh post-tests.bats / | ||
| add v1.10-migrator /usr/bin/ | ||
| entrypoint /entrypoint.sh | ||
| VOLUME /var/lib/docker | ||
| COPY pre-tests.bats entrypoint.sh post-tests.bats / | ||
| COPY v1.10-migrator /usr/bin/ | ||
| ENTRYPOINT /entrypoint.sh |