Skip to content
This repository has been archived by the owner on Dec 19, 2022. It is now read-only.

DSR-1237: Device Service update to use v1.2.2 C SDK #42

Merged
merged 6 commits into from
Aug 17, 2020
Merged

DSR-1237: Device Service update to use v1.2.2 C SDK #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dc29b43
docs: Add standard PR template
jamesrgregg Jun 18, 2020
db678a3
DSR-1237: Update to use device-sdk-c v1.2.2
BinduRao2018 Aug 10, 2020
725182a
DSR-1237: Add alpine-3.11 support
BinduRao2018 Aug 11, 2020
1c6123f
DSR-1237: Device service update to build with v1.2.2 of SDK and Suppo…
BinduRao2018 Aug 17, 2020
e24fc8d
Merge branch 'master' into DSR-1237-branch
BinduRao2018 Aug 17, 2020
c9a5d57
DSR-1237: Jenkins file update to use alpine-3.11
BinduRao2018 Aug 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGES
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
Changes for release v1.2.1
- Device service updated to use C SDK (v1.2.2)

Changes for Geneva release (v1.2.0)
- Device service updated to use C SDK (v1.2.1)
- Updated the device service to use V2 API
Expand Down
6 changes: 3 additions & 3 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

edgeXBuildCApp (
project: 'device-grove-c',
dockerBuildFilePath: 'scripts/Dockerfile.alpine-3.9-base',
dockerFilePath: 'scripts/Dockerfile.alpine-3.9',
dockerBuildFilePath: 'scripts/Dockerfile.alpine-3.11-base',
dockerFilePath: 'scripts/Dockerfile.alpine-3.11',
arch: ['arm64']
)
)
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.2.0
1.2.1
1 change: 1 addition & 0 deletions res/configuration.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
[Service]
Host = "edgex-device-grove"
ServerBindAddr = '0.0.0.0'
Port = 49992
ConnectRetries = 3
HealthCheck = ""
Expand Down
2 changes: 1 addition & 1 deletion scripts/Dockerfile.alpine-3.9 → scripts/Dockerfile.alpine-3.11
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BASE=alpine:3.9
ARG BASE=alpine:3.11
FROM ${BASE} as builder
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
Expand Down
4 changes: 2 additions & 2 deletions scripts/Dockerfile.alpine-3.9-base → scripts/Dockerfile.alpine-3.11-base
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BASE=alpine:3.9
ARG BASE=alpine:3.11
FROM ${BASE}
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
Expand All @@ -10,4 +10,4 @@ RUN mkdir -p /device-grove/build

WORKDIR /device-grove
RUN /device-grove/scripts/build_deps.sh 1
RUN /device-grove/scripts/build.sh
RUN /device-grove/scripts/build.sh
6 changes: 3 additions & 3 deletions scripts/build_deps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ then
make
make install

wget https://github.com/edgexfoundry/device-sdk-c/archive/v1.2.1.zip
unzip v1.2.1.zip
cd device-sdk-c-1.2.1
wget https://github.com/edgexfoundry/device-sdk-c/archive/v1.2.2.zip
unzip v1.2.2.zip
cd device-sdk-c-1.2.2
./scripts/build.sh
cp -rf include/* /usr/include/
cp build/release/c/libcsdk.so /usr/lib/
Expand Down