Skip to content

Commit 557cefd

Browse files
author
Gabriel Monroy
committed
fix(packaging): update Dockerfile and paths
1 parent cc22a39 commit 557cefd

3 files changed

Lines changed: 6 additions & 4 deletions

File tree

Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ RUN tar -C /usr/local -xzf /tmp/go1.3.linux-amd64.tar.gz
44
RUN apt-get update && apt-get install -yq git mercurial
55
ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/go/bin:/go/bin
66
ENV GOPATH /go
7-
ADD . /go/src/github.com/deis/deis/deisctl
7+
ADD . /go/src/github.com/deis/deisctl
88
ADD units /tmp/package/var/lib/deis/units
9-
WORKDIR /go/src/github.com/deis/deis/deisctl
10-
RUN cd deisctl && go get -v . && go install -v .
9+
ADD deis-version /tmp/package/etc/deis-version
10+
WORKDIR /go/src/github.com/deis/deisctl
11+
RUN go get -v ./... && go install -v ./...
1112
RUN mkdir -p /tmp/package/opt/bin && cp /go/bin/deisctl /tmp/package/opt/bin/deisctl
1213
RUN tar -C /tmp/package -czf /tmp/deisctl.tar.gz .
1314
ENTRYPOINT ["/go/bin/deisctl"]

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ build:
66
package:
77
rm -f package
88
docker build -t deis/deisctl .
9+
mkdir -p package
910
-docker cp $(shell docker run -d deis/deisctl):/tmp/deisctl.tar.gz package/

client/unit.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
)
1414

1515
// path hierarchy for finding systemd service templates
16-
var rootPaths = []string{"/home/core/deis/systemd", "units", "../units"}
16+
var rootPaths = []string{"/var/lib/deis/units", "units", "../units"}
1717

1818
// getUnits returns a list of units filtered by target
1919
func (c *FleetClient) getUnits(target string) (units []string, err error) {

0 commit comments

Comments
 (0)