kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

versioning kops-server container, and changing container to kubernetes default image

This commit is contained in:
chrislovecnm 2017-07-17 16:18:42 -06:00
parent 5b7c1cfe2d
commit afdf0032e6
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -60,6 +60,7 @@ endif
# + is valid in semver, but not in docker tags. Fixup CI versions.
# Note that this mirrors the logic in DefaultProtokubeImageName
PROTOKUBE_TAG := $(subst +,-,${VERSION})
KOPS_SERVER_TAG := $(subst +,-,${VERSION})
# Go exports:
@ -500,7 +501,7 @@ kops-server-build:
docker pull golang:${GOVERSION}
docker run --name=kops-server-build-${UNIQUE} -e STATIC_BUILD=yes -e VERSION=${VERSION} -v ${GOPATH}/src:/go/src -v ${MAKEDIR}:/go/src/k8s.io/kops golang:${GOVERSION} make -f /go/src/k8s.io/kops/Makefile kops-server-docker-compile
docker cp kops-server-build-${UNIQUE}:/go/.build .
docker build -t ${DOCKER_REGISTRY}/kops-server:latest -f images/kops-server/Dockerfile .
docker build -t ${DOCKER_REGISTRY}/kops-server:${KOPS_SERVER_TAG} -f images/kops-server/Dockerfile .
.PHONY: kops-server-push
kops-server-push: kops-server-build

4
images/kops-server/Dockerfile
View File

@ -12,6 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
FROM alpine:3.5
FROM gcr.io/google_containers/debian-base-amd64:0.1
# TODO
# RUN apt-get update && apt-get install --yes --reinstall lsb-base
COPY /.build/dist/linux/amd64/kops-server /kops-server
ENTRYPOINT "/kops-server"