Merge pull request #2845 from CrossStream/sandbox/rzr/review/master

git: Ignore more generated files
7 changed files with 30 additions and 7 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,4 @@
+# .gitignore
 *.db
 *.gcda
 *.gcno
@ -85,3 +86,20 @@ test/unit/out/

 www/cache/
 __pycache__
+
+# Debian generated files
+debian/.debhelper/
+debian/debhelper-build-stamp
+debian/files
+debian/*.log
+debian/*.substvars
+debian/*mosquitto*/
+debian/*.debhelper
+debian/tmp/
+obj-*/
+
+# Emacs generated files
+*~
+
+# Others
+tmp/
--- a/docker/1.5-openssl/Dockerfile
+++ b/docker/1.5-openssl/Dockerfile
@ -1,4 +1,4 @@
-FROM alpine:3.14
+FROM alpine:3.18

 LABEL maintainer="Roger Light <roger@atchoo.org>" \
    description="Eclipse Mosquitto MQTT Broker"
@ -6,16 +6,19 @@ LABEL maintainer="Roger Light <roger@atchoo.org>" \
 ENV VERSION=1.5.11 \
    DOWNLOAD_SHA256=4a3b8a8f5505d27a7a966dd68bfd76f1e69feb51796d1b46b7271d1bb5a1a299 \
    GPG_KEYS=A0D6EEA1DCAE49A635A3B2F0779B22DFB3E717B7 \
-    LWS_VERSION=2.4.2
+    LWS_VERSION=4.2.1 \
+    LWS_SHA256=842da21f73ccba2be59e680de10a8cce7928313048750eb6ad73b6fa50763c51

 RUN set -x && \
    apk --no-cache add --virtual build-deps \
        build-base \
        cmake \
        gnupg \
+        linux-headers \
        openssl-dev \
        util-linux-dev && \
    wget https://github.com/warmcat/libwebsockets/archive/v${LWS_VERSION}.tar.gz -O /tmp/lws.tar.gz && \
+    echo "$LWS_SHA256  /tmp/lws.tar.gz" | sha256sum -c - && \
    mkdir -p /build/lws && \
    tar --strip=1 -xf /tmp/lws.tar.gz -C /build/lws && \
    rm /tmp/lws.tar.gz && \
@ -23,11 +26,13 @@ RUN set -x && \
    cmake . \
        -DCMAKE_BUILD_TYPE=MinSizeRel \
        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DDISABLE_WERROR=ON \
        -DLWS_IPV6=ON \
        -DLWS_WITHOUT_BUILTIN_GETIFADDRS=ON \
        -DLWS_WITHOUT_CLIENT=ON \
        -DLWS_WITHOUT_EXTENSIONS=ON \
        -DLWS_WITHOUT_TESTAPPS=ON \
+        -DLWS_WITH_EXTERNAL_POLL=ON \
        -DLWS_WITH_HTTP2=OFF \
        -DLWS_WITH_SHARED=OFF \
        -DLWS_WITH_ZIP_FOPS=OFF \
--- a/docker/1.6-openssl/Dockerfile
+++ b/docker/1.6-openssl/Dockerfile
@ -1,4 +1,4 @@
-FROM alpine:3.14
+FROM alpine:3.18

 LABEL maintainer="Roger Light <roger@atchoo.org>" \
    description="Eclipse Mosquitto MQTT Broker"
--- a/docker/2.0-openssl/Dockerfile
+++ b/docker/2.0-openssl/Dockerfile
@ -1,4 +1,4 @@
-FROM alpine:3.16
+FROM alpine:3.18

 LABEL maintainer="Roger Light <roger@atchoo.org>" \
    description="Eclipse Mosquitto MQTT Broker"
--- a/docker/2.0/Dockerfile
+++ b/docker/2.0/Dockerfile
@ -1,4 +1,4 @@
-FROM alpine:3.16
+FROM alpine:3.18

 LABEL maintainer="Roger Light <roger@atchoo.org>" \
    description="Eclipse Mosquitto MQTT Broker"
--- a/docker/generic/Dockerfile
+++ b/docker/generic/Dockerfile
@ -1,4 +1,4 @@
-FROM alpine:3.14
+FROM alpine:3.18

 LABEL maintainer="Roger Light <roger@atchoo.org>" \
    description="Eclipse Mosquitto MQTT Broker"
--- a/docker/local/Dockerfile
+++ b/docker/local/Dockerfile
@ -1,4 +1,4 @@
-FROM alpine:3.14
+FROM alpine:3.18

 LABEL maintainer="Roger Light <roger@atchoo.org>" \
    description="Eclipse Mosquitto MQTT Broker"
Author	SHA1	Message	Date
Roger Light	5dceeb94b1	Merge pull request #2845 from CrossStream/sandbox/rzr/review/master git: Ignore more generated files	2 years ago
Philippe Coval	41a3a2068e	git: Ignore more generated files Signed-off-by: Philippe Coval <rzr@users.sf.net>	2 years ago
Roger A. Light	cc1aac336e	Bump remaining official docker images to Alpine 3.18	2 years ago
Roger A. Light	65a6ed43a5	Docker: Bump alpine to 3.18.	2 years ago