tianon

diff -Nru golang-1.3.2/VERSION golang-1.3.3/VERSION
--- golang-1.3.2/VERSION	2014-09-25 22:46:55.000000000 +0000
+++ golang-1.3.3/VERSION	2014-10-01 01:50:25.000000000 +0000
@@ -1 +1 @@
-go1.3.2
\ No newline at end of file
+go1.3.3
\ No newline at end of file
diff -Nru golang-1.3.2/debian/changelog golang-1.3.3/debian/changelog
--- golang-1.3.2/debian/changelog	2014-09-26 21:21:47.000000000 +0000

tianon

+ cd src/github.com/cpuguy83/docker-jruby
+ git reset -q HEAD
+ git checkout -q -- .
+ git clean -dfxq
+ git checkout -q 384671d2c1b26465a38c6f9e645024b3ab217bad --
+ cd src/github.com/cpuguy83/docker-jruby/9000
+ git-set-mtimes
+ docker build -t jruby:dev src/github.com/cpuguy83/docker-jruby/9000
Sending build context to Docker daemon  2.56 kB
Sending build context to Docker daemon 

tianon

#!/bin/bash
set -e

# hello-world                      latest              ef872312fe1b        3 months ago        910 B
# hello-world                      latest              ef872312fe1bbc5e05aae626791a47ee9b032efa8f3bda39cc0be7b56bfe59b9   3 months ago        910 B

# debian                           latest              f6fab3b798be        10 weeks ago        85.1 MB
# debian                           latest              f6fab3b798be3174f45aa1eb731f8182705555f89c9026d8c1ef230cbf8301dd   10 weeks ago        85.1 MB

usage() {

tianon

diff --git a/hack/vendor.sh b/project/vendor.sh
similarity index 87%
rename from hack/vendor.sh
rename to project/vendor.sh
index 7ecb1a5..b60e42f 100755
--- a/hack/vendor.sh
+++ b/project/vendor.sh
@@ -39,7 +39,7 @@ clone() {
        echo done
 }

tianon

diff --git a/Dockerfile b/Dockerfile
index fc67592..ff25f25 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,45 +7,48 @@ MAINTAINER "Carl Boettiger and Dirk Eddelbuettel" rocker-maintainers@eddelbuette
 
 ## Set a default user. Available via runtime flag `--user docker` 
 ## Add user to 'staff' group, granting them write privileges to /usr/local/lib/R/site.library
-## User should also have & own a home directory (for rstudio or linked volumes to work properly). (could use adduser to create this automatically instead)
+## User should also have & own a home directory (for rstudio or linked volumes to work properly). 

tianon

--- buildroot.txt	2015-02-02 23:32:14.769309302 -0700
+++ upstream.txt	2015-02-02 23:31:48.984899085 -0700
@@ -1,32 +1,48 @@
 [
 [[
+acpid
+add-shell
 addgroup
 adduser
-ar

tianon

FROM tianon/frankendebian
#FROM debian:experimental

# https://wiki.debian.org/BuilddSetup
# "Configure apt (don't install recommends, no pdiffs)."
RUN { \
	echo 'APT::Install-Recommends 0;'; \
	echo 'Acquire::PDiffs "false";'; \
} > /etc/apt/apt.conf.d/buildd

tianon

#!/bin/bash
set -e

str='docker run'

str+=' {{printf "--name=%q" .Name}}'
str+='{{if (eq .HostConfig.NetworkMode "bridge")}} {{printf "--hostname=%q" .Config.Hostname}}{{else}} {{printf "--net=%q" .HostConfig.NetworkMode}}{{end}}'

str+='{{if .Config.OpenStdin}} --interactive{{end}}'
str+='{{if .Config.Tty}} --tty{{end}}'

tianon

diff --git a/gcc/content.md b/gcc/content.md
index 1397f19..2953720 100644
--- a/gcc/content.md
+++ b/gcc/content.md
@@ -1,10 +1,6 @@
 # What is GCC?
 
-The GNU Compiler Collection (GCC) is a compiler system produced by the GNU
-Project that supports various programming languages. GCC is a key component of
-the GNU toolchain. The Free Software Foundation (FSF) distributes GCC under the

tianon

# ...
build:
	./hack/generate-dockerfile.sh > Dockerfile
	docker build -t docker .
# ...