github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-09-11 03:40:27 +00:00
Code Issues Projects Releases Wiki Activity

swarmd: Build from my WIP branch

Browse Source 
This is much more functional (includes networking).

Requires switching to an alpine base because CNI networking backends (such as
weave) can expect iptables binaries to be present, or may want to shell out to
scripts etc.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
This commit is contained in:
Ian Campbell
2017-05-24 14:24:38 +01:00
parent 5cc219cf72
commit 04c7bae77e
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
projects/swarmd/swarmd.yml
View File

@@ -29,7 +29,7 @@ services:
- name: ntpd - name: ntpd
image: "linuxkit/openntpd:45deeb05f736162d941c9bf494983f655ab80aa5" image: "linuxkit/openntpd:45deeb05f736162d941c9bf494983f655ab80aa5"
- name: swarmd - name: swarmd
image: "linuxkit/swarmd:a2f57f14f07fb6d7cded7832b2dabe878b28554e" image: "linuxkit/swarmd:1002422b78339a767559058d704b086889e90447"
command: ["/usr/bin/swarmd", "--containerd-addr=/run/containerd/containerd.sock", "--log-level=debug", "--state-dir=/var/lib/swarmd"] command: ["/usr/bin/swarmd", "--containerd-addr=/run/containerd/containerd.sock", "--log-level=debug", "--state-dir=/var/lib/swarmd"]
capabilities: capabilities:
- all - all

11
projects/swarmd/swarmd/Dockerfile
View File

@@ -13,15 +13,16 @@ RUN \
ENV GOPATH=/root/go ENV GOPATH=/root/go
# PR https://github.com/docker/swarmkit/pull/1965 from ijc25/containerd # https://github.com/ijc25/swarmkit/tree/containerd-wip
ENV SWARMKIT_PR=1965 ENV SWARMKIT_REPO=https://github.com/ijc25/swarmkit
ENV SWARMKIT_COMMIT=321b9c6600a9422c3245b277a1b3ae599244d4b7 ENV SWARMKIT_BRANCH=containerd-wip
ENV SWARMKIT_COMMIT=cb429323fa86df0c279a8d629e674f79a20e01e3
RUN mkdir -p $GOPATH/src/github.com/docker && \ RUN mkdir -p $GOPATH/src/github.com/docker && \
cd $GOPATH/src/github.com/docker && \ cd $GOPATH/src/github.com/docker && \
git clone https://github.com/docker/swarmkit.git git clone $SWARMKIT_REPO
WORKDIR $GOPATH/src/github.com/docker/swarmkit WORKDIR $GOPATH/src/github.com/docker/swarmkit
RUN [ -z "$SWARMKIT_PR" ] || git fetch origin pull/$SWARMKIT_PR/head RUN [ -z "$SWARMKIT_BRANCH" ] || git fetch origin $SWARMKIT_BRANCH
RUN git checkout $SWARMKIT_COMMIT RUN git checkout $SWARMKIT_COMMIT
RUN make binaries GO_GCFLAGS="-buildmode pie --ldflags '-extldflags \"-fno-PIC -static\"'" RUN make binaries GO_GCFLAGS="-buildmode pie --ldflags '-extldflags \"-fno-PIC -static\"'"