diff options
| author | Johannes M. Scheuermann <joh.scheuer@gmail.com> | 2019-11-20 08:53:36 +0100 |
|---|---|---|
| committer | Johannes M. Scheuermann <joh.scheuer@gmail.com> | 2019-11-20 08:53:36 +0100 |
| commit | 4552f1633014c2f1d4fbc65dde3e55dedf8be29e (patch) | |
| tree | bc629a43475a377f5bf59df4affcea1026f3ad7a /build/edge | |
| parent | Revert base image change (diff) | |
| download | kubeedge-4552f1633014c2f1d4fbc65dde3e55dedf8be29e.tar.gz | |
Adjust all base images to match latest golang 1.12 and alpine 3.10
Diffstat (limited to 'build/edge')
| -rw-r--r-- | build/edge/Dockerfile | 2 | ||||
| -rw-r--r-- | build/edge/docker-compose.yaml | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/build/edge/Dockerfile b/build/edge/Dockerfile index 4ae8768ce..e5fe0b2c3 100644 --- a/build/edge/Dockerfile +++ b/build/edge/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=golang:1.12-alpine3.9 +ARG BUILD_FROM=golang:1.12-alpine3.10 ARG RUN_FROM=docker:dind FROM ${BUILD_FROM} AS builder diff --git a/build/edge/docker-compose.yaml b/build/edge/docker-compose.yaml index 0b60c8a15..09266f8d0 100644 --- a/build/edge/docker-compose.yaml +++ b/build/edge/docker-compose.yaml @@ -8,7 +8,7 @@ services: dind: image: ${ARCH}/docker:dind restart: always - privileged: true + privileged: true networks: - kubeedge-bridge emqx: @@ -19,28 +19,28 @@ services: edgecore: image: ${EDGECOREIMAGE} - build: + build: context: ../.. dockerfile: ./build/edge/Dockerfile - args: - - BUILD_FROM=${ARCH}/golang:1.12-alpine3.9 - - RUN_FROM=${ARCH}/docker:dind + args: + - BUILD_FROM=${ARCH}/golang:1.12-alpine3.10 + - RUN_FROM=${ARCH}/docker:dind - QEMU_ARCH=${QEMU_ARCH} depends_on: - emqx - dind environment: mqtt.server: tcp://emqx:1883 - edgehub.websocket.url: wss://${CLOUDHUB}/e632aba927ea4ac2b575ec1603d56f10/${EDGENAME}/events + edgehub.websocket.url: wss://${CLOUDHUB}/e632aba927ea4ac2b575ec1603d56f10/${EDGENAME}/events edged.hostname-override: ${EDGENAME} edgehub.controller.node-id: ${EDGENAME} - edgehub.websocket.certfile: ${CERTFILE} + edgehub.websocket.certfile: ${CERTFILE} edgehub.websocket.keyfile: ${KEYFILE} edged.docker-address: tcp://dind:2375 DOCKER_HOST: tcp://dind:2375 volumes: - ${CERTPATH}:/etc/kubeedge/certs:ro - - /var/lib/edged:/var/lib/edged + - /var/lib/edged:/var/lib/edged - /var/lib/kubeedge:/var/lib/kubeedge privileged: true deploy: |