Commit 56f812b2 authored by Justin Santa Barbara's avatar Justin Santa Barbara
Browse files

Merge commit '8ea648b7' into release-1.7

parents 8d7a0dad 8ea648b7
No related merge requests found
Showing with 5 additions and 2 deletions
+5 -2
......@@ -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
......
......@@ -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"
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment