diff --git a/ChangeLog.txt b/ChangeLog.txt index d0d83917..3255c430 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -8,6 +8,7 @@ Apps: Build: - Fix `install` target when using WITH_CJSON=no. Closes #1938. +- Fix `generic` docker build. Closes #1945. 2.0.2 - 2020-12-10 diff --git a/docker/generic/Dockerfile b/docker/generic/Dockerfile index cc467946..bdda597b 100644 --- a/docker/generic/Dockerfile +++ b/docker/generic/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:latest AS build +FROM alpine:edge AS build # A released dist version, like "1.2.3" ARG VERSION @@ -6,14 +6,15 @@ RUN test -n "${VERSION}" RUN apk --no-cache add \ build-base \ - openssl-dev \ c-ares-dev \ + ca-certificates \ + cjson-dev \ curl \ - util-linux-dev \ libwebsockets-dev \ libxslt \ + openssl-dev \ python2 \ - ca-certificates + util-linux-dev # This build procedure is based on: # https://github.com/alpinelinux/aports/blob/master/main/mosquitto/APKBUILD @@ -48,6 +49,7 @@ LABEL maintainer="Jonathan Hanson " \ RUN apk --no-cache add \ busybox \ ca-certificates \ + cjson \ openssl \ libuuid \ libwebsockets \