diff --git a/Dockerfile b/Dockerfile index 3fce53f..d5d748d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,5 @@ +ARG KUBERNETES_HOST=${KUBERNETES_HOST:-"127.0.0.1"} + FROM golang:alpine AS deps WORKDIR /app @@ -28,9 +30,6 @@ RUN export CGO_ENABLED=0 && \ COPY . . RUN sed -i '/replace/d' go.mod -RUN if [ ! -f swagger/index.html ]; then timeout 15 bee run -gendoc=true -downdoc=true; fi -RUN bee generate routers -RUN bee generate docs RUN bee pack RUN mkdir -p /app/extracted && tar -zxvf oc-datacenter.tar.gz -C /app/extracted RUN sed -i 's/http:\/\/127.0.0.1:8080\/swagger\/swagger.json/swagger.json/g' /app/extracted/swagger/index.html @@ -39,6 +38,8 @@ RUN sed -i 's/http:\/\/127.0.0.1:8080\/swagger\/swagger.json/swagger.json/g' /ap FROM golang:alpine +ENV KUBERNETES_SERVICE_HOST=$KUBERNETES_HOST + WORKDIR /app COPY --from=builder /app/extracted/oc-datacenter /usr/bin/ COPY --from=builder /app/extracted/swagger /app/swagger diff --git a/Makefile b/Makefile index 9f040c2..07556b8 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ clean: rm -rf oc-datacenter.tar.gz docker: - DOCKER_BUILDKIT=1 docker build -t oc-datacenter -f Dockerfile . --build-arg=HOST=$(HOST) + DOCKER_BUILDKIT=1 docker build -t oc-datacenter -f Dockerfile . --build-arg=HOST=$(HOST) --build-arg=KUBERNETES_HOST=$(KUBERNETES_HOST) --build-arg=KUBERNETES_SERVICE_PORT=$(KUBERNETES_SERVICE_PORT) --build-arg=KUBE_CA=$(KUBE_CA) --build-arg=KUBE_CERT=$(KUBE_CERT) --build-arg=KUBE_DATA=$(KUBE_DATA) docker tag oc-datacenter:latest oc/oc-datacenter:0.0.1 publish-kind: