Azure
/
iotedgedev
зеркало из https://github.com/Azure/iotedgedev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge -dev with -deps docker

This commit is contained in:
Jon Gallant 2018-02-10 23:08:11 -08:00
Родитель 2ed378d9e5
Коммит 4e524fd2d6
7 изменённых файлов: 4 добавлений и 22 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
docker/linux/Dockerfile.deps
Просмотреть файл

@ -18,4 +18,8 @@ RUN apt-get update && \
az extension add --name azure-cli-iot-ext && \ az extension add --name azure-cli-iot-ext && \
npm i -g iothub-explorer && \ npm i -g iothub-explorer && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
RUN apt-get update && \
apt-get install -y --no-install-recommends python-dev build-essential libssl-dev libffi-dev libxml2-dev libxslt1-dev zlib1g-dev
COPY install-dev.sh /scripts/install-dev.sh
RUN chmod +x /scripts/install-dev.sh
ENV DEBIAN_FRONTEND teletype ENV DEBIAN_FRONTEND teletype

6
docker/linux/Dockerfile.dev
Просмотреть файл

@ -1,6 +0,0 @@
FROM jongallant/iotedgedev:${VERSION}-linux
RUN apt-get update && apt-get install -y python-dev build-essential libssl-dev libffi-dev libxml2-dev libxslt1-dev zlib1g-dev python-pip
COPY install-dev.sh /scripts/install-dev.sh
RUN chmod +x /scripts/install-dev.sh

6
docker/linux/Dockerfile.dev.expanded
Просмотреть файл

@ -1,6 +0,0 @@
FROM jongallant/iotedgedev:0.62.0-linux
RUN apt-get update && apt-get install -y python-dev build-essential libssl-dev libffi-dev libxml2-dev libxslt1-dev zlib1g-dev python-pip
COPY install-dev.sh /scripts/install-dev.sh
RUN chmod +x /scripts/install-dev.sh

2
docker/linux/build.nocache.sh
Просмотреть файл

@ -2,5 +2,3 @@ export VERSION=$1
docker build --no-cache -f Dockerfile.deps -t jongallant/iotedgedev-deps:$1 -t jongallant/iotedgedev-deps:$1-linux -t jongallant/iotedgedev-deps:latest -t jongallant/iotedgedev-deps:latest-linux . docker build --no-cache -f Dockerfile.deps -t jongallant/iotedgedev-deps:$1 -t jongallant/iotedgedev-deps:$1-linux -t jongallant/iotedgedev-deps:latest -t jongallant/iotedgedev-deps:latest-linux .
cat Dockerfile | envsubst > Dockerfile.expanded cat Dockerfile | envsubst > Dockerfile.expanded
docker build --no-cache -f Dockerfile.expanded -t jongallant/iotedgedev:$1 -t jongallant/iotedgedev:$1-linux -t jongallant/iotedgedev:latest -t jongallant/iotedgedev:latest-linux . docker build --no-cache -f Dockerfile.expanded -t jongallant/iotedgedev:$1 -t jongallant/iotedgedev:$1-linux -t jongallant/iotedgedev:latest -t jongallant/iotedgedev:latest-linux .
cat Dockerfile.dev | envsubst > Dockerfile.dev.expanded
docker build --no-cache -f Dockerfile.dev.expanded -t jongallant/iotedgedev-dev:$1 -t jongallant/iotedgedev-dev:$1-linux -t jongallant/iotedgedev-dev:latest -t jongallant/iotedgedev-dev:latest-linux .

2
docker/linux/build.sh
Просмотреть файл

@ -2,5 +2,3 @@ export VERSION=$1
docker build -f Dockerfile.deps -t jongallant/iotedgedev-deps:$1 -t jongallant/iotedgedev-deps:$1-linux -t jongallant/iotedgedev-deps:latest -t jongallant/iotedgedev-deps:latest-linux . docker build -f Dockerfile.deps -t jongallant/iotedgedev-deps:$1 -t jongallant/iotedgedev-deps:$1-linux -t jongallant/iotedgedev-deps:latest -t jongallant/iotedgedev-deps:latest-linux .
cat Dockerfile | envsubst > Dockerfile.expanded cat Dockerfile | envsubst > Dockerfile.expanded
docker build -f Dockerfile.expanded -t jongallant/iotedgedev:$1 -t jongallant/iotedgedev:$1-linux -t jongallant/iotedgedev:latest -t jongallant/iotedgedev:latest-linux . docker build -f Dockerfile.expanded -t jongallant/iotedgedev:$1 -t jongallant/iotedgedev:$1-linux -t jongallant/iotedgedev:latest -t jongallant/iotedgedev:latest-linux .
cat Dockerfile.dev | envsubst > Dockerfile.dev.expanded
docker build -f Dockerfile.dev.expanded -t jongallant/iotedgedev-dev:$1 -t jongallant/iotedgedev-dev:$1-linux -t jongallant/iotedgedev-dev:latest -t jongallant/iotedgedev-dev:latest-linux .

4
docker/linux/push.sh
Просмотреть файл

@ -4,10 +4,6 @@ docker push jongallant/iotedgedev-deps:$1
docker push jongallant/iotedgedev-deps:$1-linux docker push jongallant/iotedgedev-deps:$1-linux
docker push jongallant/iotedgedev-deps:latest docker push jongallant/iotedgedev-deps:latest
docker push jongallant/iotedgedev-deps:latest-linux docker push jongallant/iotedgedev-deps:latest-linux
docker push jongallant/iotedgedev-dev:$1
docker push jongallant/iotedgedev-dev:$1-linux
docker push jongallant/iotedgedev-dev:latest
docker push jongallant/iotedgedev-dev:latest-linux
docker push jongallant/iotedgedev:$1 docker push jongallant/iotedgedev:$1
docker push jongallant/iotedgedev:$1-linux docker push jongallant/iotedgedev:$1-linux
docker push jongallant/iotedgedev:latest docker push jongallant/iotedgedev:latest

2
docker/linux/run-dev.sh
Просмотреть файл

@ -1,2 +0,0 @@
#!/bin/bash
docker run -it -v /var/run/docker.sock:/var/run/docker.sock -v c:/temp/iotedge:/iotedge jongallant/iotedgedev-dev:$1-linux