diff --git a/devicedevex_dockerfiles/public/iot-device-cube-1.0.4/README.md b/devicedevex_dockerfiles/public/iot-device-cube-1.0.4/README.md index c68d8d8e..c2755de2 100644 --- a/devicedevex_dockerfiles/public/iot-device-cube-1.0.4/README.md +++ b/devicedevex_dockerfiles/public/iot-device-cube-1.0.4/README.md @@ -1,3 +1,3 @@ ## `iot-device-cube-1.0.4` -This serial of docker images installs latest (2019-11-13) Azure IoT C SDK with vcpkg. +This serial of docker images installs latest (2019-11-22) Azure IoT C SDK with vcpkg. diff --git a/devicedevex_dockerfiles/public/iot-device-cube-1.0.4/azure-c-sdk-public-preview-cross-toolchain-arm32/Dockerfile b/devicedevex_dockerfiles/public/iot-device-cube-1.0.4/azure-c-sdk-public-preview-cross-toolchain-arm32/Dockerfile index a4219485..41dbee10 100644 --- a/devicedevex_dockerfiles/public/iot-device-cube-1.0.4/azure-c-sdk-public-preview-cross-toolchain-arm32/Dockerfile +++ b/devicedevex_dockerfiles/public/iot-device-cube-1.0.4/azure-c-sdk-public-preview-cross-toolchain-arm32/Dockerfile @@ -36,16 +36,14 @@ RUN apt-get update && \ make install && \ cd .. && \ ls | grep -v temp | xargs rm -rf && \ - git clone https://github.com/jspaith/vcpkg/ --branch iot-provisioning3 && \ + git clone https://github.com/microsoft/vcpkg && \ cd vcpkg && \ cp /work/temp/Toolchain.cmake /work/vcpkg/scripts/toolchains/Toolchain.cmake && \ cp /work/temp/arm-linux-custom.cmake /work/vcpkg/triplets/arm-linux-custom.cmake && \ ln -s /usr/xcc/arm-linux-gnueabihf/arm-linux-gnueabihf/libc/lib/ld-linux-armhf.so.3 /lib/ld-linux-armhf.so.3 && \ - export LD_LIBRARY_PATH="${LIBC_PREFIX}:${LIBC_PREFIX}/lib" && \ - ./bootstrap-vcpkg.sh -WORKDIR /work/vcpkg -ENV LD_LIBRARY_PATH="${LIBC_PREFIX}:${LIBC_PREFIX}/lib:${LIBC_PREFIX}:${LIBC_PREFIX}/libc/lib" -RUN ./vcpkg install azure-iot-sdk-c[public-preview,use_prov_client]:arm-linux-custom && \ + export LD_LIBRARY_PATH="${LIBC_PREFIX}:${LIBC_PREFIX}/lib:${LIBC_PREFIX}:${LIBC_PREFIX}/libc/lib" && \ + ./bootstrap-vcpkg.sh && \ + ./vcpkg install azure-iot-sdk-c[public-preview,use_prov_client]:arm-linux-custom && \ apt-get remove -y wget ca-certificates xz-utils git curl unzip && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* \ No newline at end of file diff --git a/devicedevex_dockerfiles/public/iot-device-cube-1.0.4/azure-c-sdk-public-preview-cross-toolchain-arm64/Dockerfile b/devicedevex_dockerfiles/public/iot-device-cube-1.0.4/azure-c-sdk-public-preview-cross-toolchain-arm64/Dockerfile index 2b2a5d05..37ca67d1 100644 --- a/devicedevex_dockerfiles/public/iot-device-cube-1.0.4/azure-c-sdk-public-preview-cross-toolchain-arm64/Dockerfile +++ b/devicedevex_dockerfiles/public/iot-device-cube-1.0.4/azure-c-sdk-public-preview-cross-toolchain-arm64/Dockerfile @@ -37,13 +37,12 @@ RUN apt-get update && \ make install && \ cd .. && \ ls | grep -v temp | xargs rm -rf && \ - git clone https://github.com/jspaith/vcpkg/ --branch iot-provisioning3 && \ + git clone https://github.com/microsoft/vcpkg && \ cd vcpkg && \ cp /work/temp/Toolchain.cmake /work/vcpkg/scripts/toolchains/Toolchain.cmake && \ cp /work/temp/aarch64-linux-custom.cmake /work/vcpkg/triplets/aarch64-linux-custom.cmake && \ - ./bootstrap-vcpkg.sh -WORKDIR /work/vcpkg -RUN ./vcpkg install azure-iot-sdk-c[public-preview,use_prov_client]:aarch64-linux-custom && \ + ./bootstrap-vcpkg.sh && \ + ./vcpkg install azure-iot-sdk-c[public-preview,use_prov_client]:aarch64-linux-custom && \ apt-get remove -y wget ca-certificates perl git unzip && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* \ No newline at end of file diff --git a/devicedevex_dockerfiles/public/iot-device-cube-1.0.4/azure-c-sdk-public-preview-ubuntu-x86/Dockerfile b/devicedevex_dockerfiles/public/iot-device-cube-1.0.4/azure-c-sdk-public-preview-ubuntu-x86/Dockerfile index e7fa0211..f4999aab 100644 --- a/devicedevex_dockerfiles/public/iot-device-cube-1.0.4/azure-c-sdk-public-preview-ubuntu-x86/Dockerfile +++ b/devicedevex_dockerfiles/public/iot-device-cube-1.0.4/azure-c-sdk-public-preview-ubuntu-x86/Dockerfile @@ -5,11 +5,10 @@ WORKDIR /work RUN apt-get update && \ apt-get install -y git cmake build-essential libcurl4-openssl-dev libssl-dev uuid-dev curl unzip tar && \ - git clone https://github.com/jspaith/vcpkg/ --branch iot-provisioning3 && \ + git clone https://github.com/microsoft/vcpkg && \ cd vcpkg && \ - ./bootstrap-vcpkg.sh -WORKDIR /work/vcpkg -RUN ./vcpkg install azure-iot-sdk-c[public-preview,use_prov_client] && \ + ./bootstrap-vcpkg.sh && \ + ./vcpkg install azure-iot-sdk-c[public-preview,use_prov_client] && \ apt-get remove -y git unzip && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* \ No newline at end of file