tiborvass

#!/usr/bin/python

def main(args):
    print(args)

tiborvass

MacBook-Pro:review tibor$ gl
* 3a48299 (origin/alice, alice) alice fix
| * 8dc2ba1 (origin/bob, bob) bob fix
|/
* af5062b (HEAD, origin/master, master) first commit

MacBook-Pro:review tibor$ ls
test.js

MacBook-Pro:review tibor$ cat test.js

tiborvass

$ cat ~/.gitconfig | tail -2
[alias]
	mdiff = "!f() { git stash | head -1 | grep -q 'No local changes to save'; x=$?; git merge --no-commit $1 &>/dev/null; git add -u &>/dev/null; git diff --staged; git reset --hard &>/dev/null; test $x -ne 0 && git stash pop &>/dev/null; }; f"
$ git status
On branch master
Your branch is ahead of 'origin/master' by 2 commits.
  (use "git push" to publish your local commits)
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

tiborvass

[alias]
	mdiff = "!f() { git stash | head -1 | grep -q 'No local changes to save'; x=$?; git merge --no-commit $1 &>/dev/null; git add -u &>/dev/null; git diff --staged; git reset --hard &>/dev/null; test $x -ne 0 && git stash pop &>/dev/null; }; f"

tiborvass

diff --git a/integration-cli/docker_cli_build_test.go b/integration-cli/docker_cli_build_test.go
index fad3831..80cf499 100644
--- a/integration-cli/docker_cli_build_test.go
+++ b/integration-cli/docker_cli_build_test.go
@@ -4642,7 +4642,7 @@ func TestBuildDockerfileOutsideContext(t *testing.T) {
 	if err := os.MkdirAll(ctx, 0755); err != nil {
 		t.Fatal(err)
 	}
-	if err := ioutil.WriteFile(filepath.Join(ctx, "Dockerfile"), []byte("FROM busybox"), 0644); err != nil {
+	if err := ioutil.WriteFile(filepath.Join(ctx, "Dockerfile"), []byte("FROM scratch\nENV X Y"), 0644); err != nil {

tiborvass

From 7ac97fc5eba0f5d1de4155086383c79aac34f582 Mon Sep 17 00:00:00 2001
From: Tibor Vass <teabee89@gmail.com>
Date: Mon, 26 Jan 2015 18:17:32 -0500
Subject: [PATCH] New pull request review workflow

Signed-off-by: Tibor Vass <teabee89@gmail.com>
---
 project/MAINTAINERS.md | 119 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 119 insertions(+)

tiborvass

//go:generate behave wait -type when 'I wait for the container "{name}"'
func wait(name string) {
  //...
}

tiborvass

SvenDowideit@fosiki.com
SvenDowideit@home.org.au
aanand@docker.com
admwiggin@gmail.com
ahmetalpbalkan@gmail.com
alexl@redhat.com
aluzzardi@docker.com
arnaud@docker.com
asbjorn@hanafjedle.net
ben@firshman.co.uk

tiborvass

package main

import (
	"crypto/tls"
	"crypto/x509"
	"fmt"
	"io/ioutil"
	"log"
	"net"
	"os"

tiborvass

MacBook-Pro:test tibor$ ls -l
total 16
-rw-r--r--  1 tibor  wheel   40 Feb 28 13:36 Dockerfile
-rwxr-xr-x  1 tibor  wheel  166 Feb 28 13:45 build.sh
MacBook-Pro:test tibor$ cat Dockerfile
from busybox
copy . /
cmd ["/build.sh"]
MacBook-Pro:test tibor$ cat build.sh
#!/bin/sh