Skip to content

Commit 304244c

Browse files
committed
Merge pull request #38 from infosiftr/buildpack-deps-micro
Update to use buildpack-deps:*-scm as the base
2 parents e2a3aaf + 2668a6b commit 304244c

File tree

5 files changed

+13
-17
lines changed

5 files changed

+13
-17
lines changed

1.3/Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
FROM debian:jessie
1+
FROM buildpack-deps:jessie-scm
22

3-
# SCMs for "go get", gcc for cgo
3+
# gcc for cgo
44
RUN apt-get update && apt-get install -y \
5-
ca-certificates curl gcc libc6-dev make \
6-
bzr git mercurial \
5+
gcc libc6-dev make \
76
--no-install-recommends \
87
&& rm -rf /var/lib/apt/lists/*
98

1.3/wheezy/Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
FROM debian:wheezy
1+
FROM buildpack-deps:wheezy-scm
22

3-
# SCMs for "go get", gcc for cgo
3+
# gcc for cgo
44
RUN apt-get update && apt-get install -y \
5-
ca-certificates curl gcc libc6-dev make \
6-
bzr git mercurial \
5+
gcc libc6-dev make \
76
--no-install-recommends \
87
&& rm -rf /var/lib/apt/lists/*
98

1.4/Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
FROM debian:jessie
1+
FROM buildpack-deps:jessie-scm
22

3-
# SCMs for "go get", gcc for cgo
3+
# gcc for cgo
44
RUN apt-get update && apt-get install -y \
5-
ca-certificates curl gcc libc6-dev make \
6-
bzr git mercurial \
5+
gcc libc6-dev make \
76
--no-install-recommends \
87
&& rm -rf /var/lib/apt/lists/*
98

1.4/wheezy/Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
FROM debian:wheezy
1+
FROM buildpack-deps:wheezy-scm
22

3-
# SCMs for "go get", gcc for cgo
3+
# gcc for cgo
44
RUN apt-get update && apt-get install -y \
5-
ca-certificates curl gcc libc6-dev make \
6-
bzr git mercurial \
5+
gcc libc6-dev make \
76
--no-install-recommends \
87
&& rm -rf /var/lib/apt/lists/*
98

update.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ for version in "${versions[@]}"; do
2424
(
2525
set -x
2626
cp "$version/Dockerfile" "$version/go-wrapper" "$version/$variant/"
27-
sed -i 's/^FROM .*/FROM debian:'"$variant"'/' "$version/$variant/Dockerfile"
27+
sed -i 's/^FROM .*/FROM buildpack-deps:'"$variant"'-micro/' "$version/$variant/Dockerfile"
2828
)
2929
fi
3030
done

0 commit comments

Comments
 (0)