ci: standardize dockerfiles

Jenkinsfile

@@ -16,7 +16,7 @@
 
 edgeXBuildCApp (
     project: 'device-grove-c',
-    dockerBuildFilePath: 'scripts/Dockerfile.alpine-3.11-base',
-    dockerFilePath: 'scripts/Dockerfile.alpine-3.11',
+    dockerBuildFilePath: 'scripts/Dockerfile.alpine-base',
+    dockerFilePath: 'scripts/Dockerfile.alpine',
     arch: ['arm64']
 )

scripts/Dockerfile.alpine-3.11 → scripts/Dockerfile.alpine

@@ -1,6 +1,22 @@
-ARG BASE=alpine:3.11
+#
+# Copyright (c) 2020 IOTech Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+ARG BASE=alpine:3.12
 FROM ${BASE} as builder
-MAINTAINER Bindu Rao <bindu@iotechsys.com>
+LABEL maintainer="Bindu Rao <bindu@iotechsys.com>"
 RUN apk add --update --no-cache build-base git gcc cmake make linux-headers yaml-dev libmicrohttpd-dev curl-dev util-linux-dev ncurses-dev
 
 COPY scripts /device-grove/scripts
@@ -12,7 +28,8 @@ WORKDIR /device-grove
 RUN /device-grove/scripts/build_deps.sh 1
 RUN /device-grove/scripts/build.sh
 
-FROM alpine:3.11
+FROM ${BASE}
+WORKDIR /
 
 RUN apk add --update --no-cache linux-headers yaml libmicrohttpd curl libuuid
 

scripts/Dockerfile.alpine-base

@@ -0,0 +1,30 @@
+#
+# Copyright (c) 2020 IOTech Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+ARG BASE=alpine:3.12
+FROM ${BASE}
+LABEL maintainer="Bindu Rao <bindu@iotechsys.com>"
+RUN apk add --update --no-cache build-base git gcc cmake make linux-headers yaml-dev libmicrohttpd-dev curl-dev util-linux-dev ncurses-dev
+
+COPY scripts /device-grove/scripts
+COPY src /device-grove/src/
+COPY Makefile /device-grove/Makefile
+RUN cd /device-grove && make -s version | tee /device-grove/VERSION && rm -f /device-grove/Makefile
+RUN mkdir -p /device-grove/build
+
+WORKDIR /device-grove
+RUN /device-grove/scripts/build_deps.sh 1
+RUN /device-grove/scripts/build.sh