Skip to content

Commit 2e0fb5c

Browse files
committed
Merge pull request #37 from moul/add-scaleway
Add Scaleway image
2 parents 4f369d4 + c862d1b commit 2e0fb5c

4 files changed

Lines changed: 72 additions & 0 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,4 @@ id_rsa*
3030
profile.out
3131

3232
.docker-container-built
33+
dist/

contrib/scaleway/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
.docker-container.built
2+
docker-rules.mk

contrib/scaleway/Dockerfile

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
## -*- docker-image-name: "scaleway/ssh2docker:latest" -*-
2+
FROM scaleway/docker:1.8.2
3+
4+
5+
# Prepare rootfs for image-builder
6+
RUN /usr/local/sbin/builder-enter
7+
8+
9+
# Install Golang (see https://github.com/scaleway-community/scaleway-golang/blob/master/Dockerfile)
10+
RUN apt-get update -qq \
11+
&& apt-get install -y -q --no-install-recommends \
12+
curl gcc ca-certificates libc6-dev git mercurial \
13+
&& apt-get clean
14+
ENV GOARCH=arm GOOS=linux GOLANG_VERSION=1.5.1 GOROOT=/usr/local/go GOPATH=/go
15+
ENV PATH=${PATH}:${GOROOT}/bin:${GOPATH}/bin
16+
RUN echo "Installing Golang 1.4" \
17+
&& cd /tmp \
18+
&& curl -O https://storage.googleapis.com/golang/go1.4.2.src.tar.gz \
19+
&& echo '460caac03379f746c473814a65223397e9c9a2f6 go1.4.2.src.tar.gz' | sha1sum -c \
20+
&& tar -C /usr/local -xzf go1.4.2.src.tar.gz \
21+
&& rm -f go1.4.2.src.tar.gz \
22+
&& mv /usr/local/go /usr/local/go1.4.2 \
23+
&& cd /usr/local/go1.4.2/src \
24+
&& ./make.bash \
25+
&& echo "Installing Golang 1.5.1 Using go1.4.2" \
26+
&& cd /tmp \
27+
&& curl -O https://storage.googleapis.com/golang/go1.5.1.src.tar.gz \
28+
&& echo '0df564746d105f4180c2b576a1553ebca9d9a124 go1.5.1.src.tar.gz' | sha1sum -c \
29+
&& tar -C /usr/local -xzf go1.5.1.src.tar.gz \
30+
&& rm -f /tmp/go1.5.1.src.tar.gz \
31+
&& cd /usr/local/go/src \
32+
&& GOROOT_BOOTSTRAP=/usr/local/go1.4.2 ./make.bash --no-clean \
33+
&& rm -rf /usr/local/go1.4.2
34+
RUN echo "Configure environment" \
35+
&& mkdir -p /go/src /go/bin \
36+
&& chmod -R 777 /go \
37+
&& echo export GOROOT=${GOROOT} > /etc/profile.d/golang.sh \
38+
&& echo export GOPATH=${GOPATH} >> /etc/profile.d/golang.sh \
39+
&& echo export PATH=\${PATH}:\${GOROOT}/bin:\${GOPATH}/bin >> /etc/profile.d/golang.sh
40+
41+
42+
# Install ssh2docker
43+
RUN go get github.com/moul/ssh2docker/...
44+
45+
46+
# Change default ssh port to something else
47+
RUN echo "FIXME"
48+
49+
50+
# Clean rootfs from image-builder
51+
RUN /usr/local/sbin/builder-leave

contrib/scaleway/Makefile

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
NAME = ssh2docker
2+
VERSION = latest
3+
VERSION_ALIASES =
4+
TITLE = ssh2docker
5+
DESCRIPTION = SSH proxy to Docker containers
6+
SOURCE_URL = https://github.com/moul/ssh2docker
7+
VENDOR_URL = https://github.com/moul/ssh2docker
8+
9+
IMAGE_VOLUME_SIZE = 50G
10+
IMAGE_BOOTSCRIPT = docker
11+
IMAGE_NAME = ssh2docker
12+
13+
14+
## Image tools (https://github.com/scaleway/image-tools)
15+
all: docker-rules.mk
16+
docker-rules.mk:
17+
wget -qO - http://j.mp/scw-builder | bash
18+
-include docker-rules.mk

0 commit comments

Comments
 (0)