Skip to content
This repository was archived by the owner on Jan 1, 2024. It is now read-only.

Commit dc3c88e

Browse files
tobbenbthelamer
authored andcommitted
Add boost dependencies and turn off static boost build. Bump to Alpine 3.9
1 parent 97767e7 commit dc3c88e

File tree

5 files changed

+28
-7
lines changed

5 files changed

+28
-7
lines changed

Dockerfile

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM lsiobase/alpine:3.8
1+
FROM lsiobase/alpine:3.9
22

33
# set version label
44
ARG BUILD_DATE
@@ -21,7 +21,6 @@ RUN \
2121
automake \
2222
binutils \
2323
boost-dev \
24-
cmake \
2524
confuse-dev \
2625
curl-dev \
2726
doxygen \
@@ -45,8 +44,14 @@ RUN \
4544
sqlite-dev \
4645
tar \
4746
zlib-dev && \
47+
echo "**** install build packages from edge****" && \
48+
apk add --no-cache --virtual=build-dependencies-edge --repository http://dl-3.alpinelinux.org/alpine/edge/main/ \
49+
cmake && \
4850
echo "**** install runtime packages ****" && \
4951
apk add --no-cache \
52+
boost \
53+
boost-system \
54+
boost-thread \
5055
curl \
5156
eudev-libs \
5257
libressl \
@@ -101,6 +106,7 @@ RUN \
101106
-DUSE_BUILTIN_LUA=OFF \
102107
-DUSE_BUILTIN_MQTT=OFF \
103108
-DUSE_BUILTIN_SQLITE=OFF \
109+
-DUSE_STATIC_BOOST=OFF \
104110
-DUSE_STATIC_LIBSTDCXX=OFF \
105111
-DUSE_STATIC_OPENZWAVE=OFF \
106112
-Wno-dev && \

Dockerfile.aarch64

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM lsiobase/alpine:arm64v8-3.8
1+
FROM lsiobase/alpine:arm64v8-3.9
22

33
# set version label
44
ARG BUILD_DATE
@@ -21,7 +21,6 @@ RUN \
2121
automake \
2222
binutils \
2323
boost-dev \
24-
cmake \
2524
confuse-dev \
2625
curl-dev \
2726
doxygen \
@@ -45,8 +44,14 @@ RUN \
4544
sqlite-dev \
4645
tar \
4746
zlib-dev && \
47+
echo "**** install build packages from edge****" && \
48+
apk add --no-cache --virtual=build-dependencies-edge --repository http://dl-3.alpinelinux.org/alpine/edge/main/ \
49+
cmake && \
4850
echo "**** install runtime packages ****" && \
4951
apk add --no-cache \
52+
boost \
53+
boost-system \
54+
boost-thread \
5055
curl \
5156
eudev-libs \
5257
libressl \
@@ -101,6 +106,7 @@ RUN \
101106
-DUSE_BUILTIN_LUA=OFF \
102107
-DUSE_BUILTIN_MQTT=OFF \
103108
-DUSE_BUILTIN_SQLITE=OFF \
109+
-DUSE_STATIC_BOOST=OFF \
104110
-DUSE_STATIC_LIBSTDCXX=OFF \
105111
-DUSE_STATIC_OPENZWAVE=OFF \
106112
-Wno-dev && \
@@ -126,7 +132,8 @@ RUN \
126132
usermod -a -G 16,20 abc && \
127133
echo " **** cleanup ****" && \
128134
apk del --purge \
129-
build-dependencies && \
135+
build-dependencies \
136+
build-dependencies-edge && \
130137
rm -rf \
131138
/tmp/* \
132139
/usr/lib/libftdi* \

Dockerfile.armhf

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM lsiobase/alpine:arm32v7-3.8
1+
FROM lsiobase/alpine:arm32v7-3.9
22

33
# set version label
44
ARG BUILD_DATE
@@ -21,7 +21,6 @@ RUN \
2121
automake \
2222
binutils \
2323
boost-dev \
24-
cmake \
2524
confuse-dev \
2625
curl-dev \
2726
doxygen \
@@ -45,8 +44,14 @@ RUN \
4544
sqlite-dev \
4645
tar \
4746
zlib-dev && \
47+
echo "**** install build packages from edge****" && \
48+
apk add --no-cache --virtual=build-dependencies-edge --repository http://dl-3.alpinelinux.org/alpine/edge/main/ \
49+
cmake && \
4850
echo "**** install runtime packages ****" && \
4951
apk add --no-cache \
52+
boost \
53+
boost-system \
54+
boost-thread \
5055
curl \
5156
eudev-libs \
5257
libressl \
@@ -101,6 +106,7 @@ RUN \
101106
-DUSE_BUILTIN_LUA=OFF \
102107
-DUSE_BUILTIN_MQTT=OFF \
103108
-DUSE_BUILTIN_SQLITE=OFF \
109+
-DUSE_STATIC_BOOST=OFF \
104110
-DUSE_STATIC_LIBSTDCXX=OFF \
105111
-DUSE_STATIC_OPENZWAVE=OFF \
106112
-Wno-dev && \

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
213213

214214
## Versions
215215

216+
* **12.05.19:** - Add boost dependencies and turn off static boost build. Bump to Alpine 3.9.
216217
* **30.03.19:** - Add env variable to set webroot.
217218
* **23.03.19:** - Switching to new Base images, shift to arm32v7 tag.
218219
* **19.02.19:** - Fix branch for version logic.

readme-vars.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ app_setup_block: |
7575
7676
# changelog
7777
changelogs:
78+
- { date: "12.05.19:", desc: "Add boost dependencies and turn off static boost build. Bump to Alpine 3.9." }
7879
- { date: "30.03.19:", desc: "Add env variable to set webroot." }
7980
- { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." }
8081
- { date: "19.02.19:", desc: "Fix branch for version logic." }

0 commit comments

Comments
 (0)