Skip to content

Commit

Permalink
build: move to Alpine 3.11
Browse files Browse the repository at this point in the history
Signed-off-by: Iain Anderson <[email protected]>
  • Loading branch information
iain-anderson committed Sep 16, 2020
1 parent b3d65a8 commit 279b72c
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
6 changes: 3 additions & 3 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@

edgeXBuildCApp (
project: 'device-bacnet-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'
)
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ docker: $(DOCKERS)

docker_device_bacnet_c:
docker build \
-f scripts/Dockerfile.alpine-3.9 \
-f scripts/Dockerfile.alpine-3.11 \
--label "git_sha=$(GIT_SHA)" \
-t edgexfoundry/docker-device-bacnet-c:${GIT_SHA} \
-t edgexfoundry/docker-device-bacnet-c:${VERSION}-dev \
.
.
4 changes: 2 additions & 2 deletions docs/containerisation.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
Containerisation of the BACnet device service.

The BACnet device service can be build in a docker container. A Docker file is
provided in the scripts/ directory using Alpine Linux 3.9 as the base image. To build an
provided in the scripts/ directory using Alpine Linux 3.11 as the base image. To build an
image using this Docker file, change directory to the base directory of the
device service and execute the following command:

$ docker build --no-cache --tag bacnet-device-service --file ./scripts/Dockerfile.alpine-3.9 .
$ docker build --no-cache --tag bacnet-device-service --file ./scripts/Dockerfile.alpine-3.11 .

This will build the device service image containing both the BACnet/IP and
BACnet/MSTP device services.
Expand Down
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
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 @@ -12,7 +12,7 @@ RUN /device-bacnet-c/scripts/build_deps.sh

RUN /device-bacnet-c/scripts/build.sh

FROM alpine:3.9
FROM alpine:3.11
MAINTAINER iotech <[email protected]>
RUN apk add --update --no-cache linux-headers yaml libmicrohttpd curl libuuid

Expand All @@ -30,6 +30,6 @@ COPY res /res
COPY profiles /profiles

LABEL license='SPDX-License-Identifier: Apache-2.0' \
copyright='Copyright (c) 2019: IoTech Ltd'
copyright='Copyright (c) 2019-2020: IoTech Ltd'

ENTRYPOINT ["/startup.sh"]
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}
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 @@ WORKDIR /device-bacnet-c

RUN /device-bacnet-c/scripts/build_deps.sh

RUN /device-bacnet-c/scripts/build.sh
RUN /device-bacnet-c/scripts/build.sh

0 comments on commit 279b72c

Please sign in to comment.