Skip to content

Commit

Permalink
Fix generic docker build.
Browse files Browse the repository at this point in the history
Closes #1945. Thanks to Andreas Schildbach.
  • Loading branch information
ralight committed Dec 13, 2020
1 parent f63386b commit 74f3285
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
1 change: 1 addition & 0 deletions ChangeLog.txt
Expand Up @@ -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
Expand Down
10 changes: 6 additions & 4 deletions docker/generic/Dockerfile
@@ -1,19 +1,20 @@
FROM alpine:latest AS build
FROM alpine:edge AS build

# A released dist version, like "1.2.3"
ARG VERSION
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
Expand Down Expand Up @@ -48,6 +49,7 @@ LABEL maintainer="Jonathan Hanson <[email protected]>" \
RUN apk --no-cache add \
busybox \
ca-certificates \
cjson \
openssl \
libuuid \
libwebsockets \
Expand Down

0 comments on commit 74f3285

Please sign in to comment.