Skip to content
This repository was archived by the owner on Aug 29, 2018. It is now read-only.

Commit 3d25ad8

Browse files
Merge pull request #41 from kraman/fix_dockerfile
Fix dockerfile to use build script
2 parents 6a59d5f + c65bd86 commit 3d25ad8

File tree

1 file changed

+6
-15
lines changed

1 file changed

+6
-15
lines changed

Dockerfile

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,19 @@ FROM fedora
22
MAINTAINER Clayton Coleman <ccoleman@redhat.com>
33

44
ENV GOPATH /go
5-
RUN yum install -y golang git hg bzr gcc libselinux-devel && yum clean all
5+
RUN yum install -y golang git hg bzr libselinux-devel glibc-static btrfs-progs-devel device-mapper-devel sqlite-devel libnetfilter_queue-devel gcc gcc-c++ && yum clean all
66
RUN mkdir -p $GOPATH && echo $GOPATH >> ~/.bash_profile
77

88
ADD . /go/src/github.com/openshift/geard
99
WORKDIR /go/src/github.com/openshift/geard
1010
RUN \
11-
go get -tags selinux ./... && \
12-
go get launchpad.net/gocheck && \
13-
go install -tags selinux github.com/openshift/geard/cmd/gear && \
14-
go install -tags selinux github.com/openshift/geard/cmd/switchns && \
15-
go install -tags selinux github.com/openshift/geard/cmd/gear-auth-keys-command && \
16-
go test -tags integration github.com/openshift/geard/tests -c && \
17-
/bin/cp -f $GOPATH/bin/{gear,switchns} /bin/ && \
18-
/bin/cp -f $GOPATH/bin/gear-auth-keys-command /sbin/ && \
19-
/bin/cp -f tests.test /bin/ && \
11+
./contrib/build -s -n && \
12+
./contrib/test && \
13+
/bin/cp -f $GOPATH/bin/gear-auth-keys-command /usr/sbin/ && \
14+
/bin/cp -f $GOPATH/bin/switchns /usr/bin && \
15+
/bin/cp -f $GOPATH/bin/gear /usr/bin && \
2016
rm -rf $GOPATH
2117

22-
# Create an environment for Git execution
23-
ADD contrib/githost/default-hooks/ /home/git/default-hooks
24-
ADD contrib/githost/init /home/git/init
25-
RUN useradd git --uid 1001 -U && mkdir -p /home/git && chown -R git /home/git
26-
2718
CMD ["/bin/gear", "daemon"]
2819
EXPOSE 43273
2920
VOLUME /var/lib/containers

0 commit comments

Comments
 (0)