Merged PR 869747: Added base image for edge hub amd64

- base image for edgeHub linux-amd64 - changed base image tag for edgeHub linux-amd64
mihainstr · May 31, 2018 · 0448a2e · 0448a2e
1 parent 0cae945
commit 0448a2e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/edge-agent/docker/linux/amd64/Dockerfile b/edge-agent/docker/linux/amd64/Dockerfile
@@ -1,5 +1,5 @@
 ARG base_tag=2.1.0-rc1-runtime-alpine3.7
-FROM azureiotedge/azureiotedge-agent-base:1.0.0-linux-amd64 as builder
+FROM azureiotedge/azureiotedge-agent-base:1.0.0-preview001-linux-amd64 as builder
 
 FROM microsoft/dotnet:${base_tag}
 

diff --git a/edge-hub/docker/linux/amd64/Dockerfile b/edge-hub/docker/linux/amd64/Dockerfile
@@ -1,18 +1,5 @@
 ARG base_tag=2.1.0-rc1-runtime-alpine3.7
-ARG num_procs=4
-
-FROM alpine:3.7 as builder
-
-# Build RocksDB for alpine
-RUN apk update && \
-    apk add build-base bash perl linux-headers coreutils git snappy-dev
-
-RUN git clone -b v5.4.6 --depth 1 https://github.com/facebook/rocksdb.git && \
-    cd rocksdb && \
-    CFLAGS="-static-libstdc++ -Wno-psabi -DSNAPPY" PORTABLE=1 make -j ${num_procs} shared_lib && \
-    strip librocksdb.so && \
-    mkdir -p ../publish && \
-    cp -vL librocksdb.so ../publish/
+FROM azureiotedge/azureiotedge-hub-base:1.0.0-preview001-linux-amd64 as builder
 
 FROM microsoft/dotnet:${base_tag}
 

diff --git a/edge-hub/docker/linux/amd64/base/Dockerfile b/edge-hub/docker/linux/amd64/base/Dockerfile
@@ -0,0 +1,14 @@
+ARG num_procs=4
+
+FROM alpine:3.7
+
+# Build RocksDB for alpine
+RUN apk update && \
+    apk add build-base bash perl linux-headers coreutils git snappy-dev
+
+RUN git clone -b v5.4.6 --depth 1 https://github.com/facebook/rocksdb.git && \
+    cd rocksdb && \
+    CFLAGS="-static-libstdc++ -Wno-psabi -DSNAPPY" PORTABLE=1 make -j ${num_procs} shared_lib && \
+    strip librocksdb.so && \
+    mkdir -p ../publish && \
+    cp -vL librocksdb.so ../publish/