ソースを参照

Hack: improve the Dockerfile for an easier development workflow. Build dev container once, run a shell with source mount-binded, run tests as you edit. LIKE A BOSS.

Solomon Hykes 12 年 前
コミット
47838051be
4 ファイル変更3 行追加7 行削除
  1. 3 7
      Dockerfile
  2. 0 0
      hack/RELEASE-CHECKLIST.md
  3. 0 0
      hack/make.sh
  4. 0 0
      hack/release.sh

+ 3 - 7
Dockerfile

@@ -16,7 +16,7 @@
 # -e AWS_ACCESS_KEY=foo \
 # -e AWS_SECRET_KEY=bar \
 # -e GPG_PASSPHRASE=gloubiboulga \
-# -lxc-conf=lxc.aa_profile=unconfined -privileged docker hack/release/release.sh
+# -lxc-conf=lxc.aa_profile=unconfined -privileged docker hack/release.sh
 # 
 
 docker-version 0.6.1
@@ -52,13 +52,9 @@ run	PKG=github.com/gorilla/context/ REV=708054d61e5; git clone http://$PKG /go/s
 run	PKG=github.com/gorilla/mux/ REV=9b36453141c;	 git clone http://$PKG /go/src/$PKG && cd /go/src/$PKG && git checkout -f $REV
 run	PKG=github.com/dotcloud/tar/ REV=e5ea6bb21a3294;	 git clone http://$PKG /go/src/$PKG && cd /go/src/$PKG && git checkout -f $REV
 run	PKG=code.google.com/p/go.net/ REV=84a4013f96e0;  hg  clone http://$PKG /go/src/$PKG && cd /go/src/$PKG && hg  checkout    $REV
-# Upload docker source
-add	.       /go/src/github.com/dotcloud/docker
-run	ln -s	/go/src/github.com/dotcloud/docker /src
 volume	/var/lib/docker
-# Build the binary
-run	cd /go/src/github.com/dotcloud/docker && hack/release/make.sh
 workdir	/go/src/github.com/dotcloud/docker
 # Wrap all commands in the "docker-in-docker" script to allow nested containers
 entrypoint ["hack/dind"]
-cmd	cd /go/src/github.com/dotcloud/docker && hack/release/release.sh
+# Upload docker source
+add	.       /go/src/github.com/dotcloud/docker

+ 0 - 0
hack/release/README.md → hack/RELEASE-CHECKLIST.md


+ 0 - 0
hack/release/make.sh → hack/make.sh


+ 0 - 0
hack/release/release.sh → hack/release.sh