d0kuhn/mosquitto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix generic docker build.

Browse Source 
Closes #1945. Thanks to Andreas Schildbach.
This commit is contained in:
Roger Light 2020-12-13 21:11:15 +00:00
parent f63386bf4a
commit 74f3285cf8
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog.txt
View File

@ -8,6 +8,7 @@ Apps:
Build: Build:
- Fix `install` target when using WITH_CJSON=no. Closes #1938. - Fix `install` target when using WITH_CJSON=no. Closes #1938.
- Fix `generic` docker build. Closes #1945.
2.0.2 - 2020-12-10 2.0.2 - 2020-12-10

10
docker/generic/Dockerfile
View File

@ -1,4 +1,4 @@
FROM alpine:latest AS build FROM alpine:edge AS build
# A released dist version, like "1.2.3" # A released dist version, like "1.2.3"
ARG VERSION ARG VERSION
@ -6,14 +6,15 @@ RUN test -n "${VERSION}"
RUN apk --no-cache add \ RUN apk --no-cache add \
build-base \ build-base \
openssl-dev \
c-ares-dev \ c-ares-dev \
ca-certificates \
cjson-dev \
curl \ curl \
util-linux-dev \
libwebsockets-dev \ libwebsockets-dev \
libxslt \ libxslt \
openssl-dev \
python2 \ python2 \
ca-certificates util-linux-dev
# This build procedure is based on: # This build procedure is based on:
# https://github.com/alpinelinux/aports/blob/master/main/mosquitto/APKBUILD # https://github.com/alpinelinux/aports/blob/master/main/mosquitto/APKBUILD
@ -48,6 +49,7 @@ LABEL maintainer="Jonathan Hanson <jonathan@jonathan-hanson.org>" \
RUN apk --no-cache add \ RUN apk --no-cache add \
busybox \ busybox \
ca-certificates \ ca-certificates \
cjson \
openssl \ openssl \
libuuid \ libuuid \
libwebsockets \ libwebsockets \