Skip to content
This repository was archived by the owner on Sep 20, 2019. It is now read-only.

Commit d3d86e5

Browse files
committed
Improved container build process and fixed some old repo references
1 parent a54d0a2 commit d3d86e5

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ FROM alpine:latest
77
RUN apk --no-cache add ca-certificates
88
WORKDIR /root/
99
COPY --from=builder /go/src/github.com/swisstxt/cloudstack-cloud-controller-manager/cloudstack-ccm .
10-
CMD ["./cloudstack-ccm"]
10+
CMD ["./cloudstack-ccm", "--cloud-provider", "external-cloudstack"]

Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,7 @@ cloudstack-ccm: ${CMD_SRC}
2727

2828
docker:
2929
docker build . -t cloudstack-cloud-controller-manager:${GIT_COMMIT_SHORT}
30+
docker tag cloudstack-cloud-controller-manager:${GIT_COMMIT_SHORT} cloudstack-cloud-controller-manager:latest
31+
ifneq (${GIT_IS_TAG},NOT_A_TAG)
32+
docker tag cloudstack-cloud-controller-manager:${GIT_COMMIT_SHORT} cloudstack-cloud-controller-manager:${GIT_TAG}
33+
endif

README.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,15 +116,16 @@ To build the controller with correct versioning, some build flags need to be pas
116116
A Makefile is provided that sets these build flags to values obtained from git.
117117

118118
```bash
119-
go get github.com/swisstxt/cloudstack-cloud-controller-manager
120-
cd ${GOPATH}/src/github.com/swisstxt/cloudstack-cloud-controller-manager
119+
go get github.com/apache/cloudstack-kubernetes-provider
120+
cd ${GOPATH}/src/github.com/apache/cloudstack-kubernetes-provider
121121
make
122122
```
123123

124-
To build the cloudstack-cloud-controller-manager container, please use the provided Docker file:
124+
To build the cloudstack-cloud-controller-manager container, please use the provided Dockerfile.
125+
The Makefile will also with that and properly tag the resulting container.
125126

126127
```bash
127-
docker build . -t swisstxt/cloudstack-cloud-controller-manager:latest
128+
make docker
128129
```
129130

130131
### Testing

0 commit comments

Comments
 (0)