Update to Eggdrop v1.10.1 **STABLE**
Diff for 4d57a65b0c1d8c18325e8955538e0e18373c140e:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 28d0baa..248f78c 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -6,9 +6,9 @@ Architectures: amd64, arm32v6, arm64v8
GitCommit: 57fb1652a1880665b12e9f51775f173ecde24285
Directory: 1.9
-Tags: 1.10, 1.10.0, stable, latest
+Tags: 1.10, 1.10.1, stable, latest
Architectures: amd64, arm32v6, arm64v8
-GitCommit: 2861815d67478e41667b8ed2cf9d3f13a5e755c1
+GitCommit: 4d59ce8afdc7fc78b6e7aa1c88b1cb693b6945da
Directory: 1.10
Tags: 1.10.1rc1
diff --git a/_bashbrew-list b/_bashbrew-list
index 71341d4..f8b534f 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,7 +1,7 @@
eggdrop:1.9
eggdrop:1.9.5
eggdrop:1.10
-eggdrop:1.10.0
+eggdrop:1.10.1
eggdrop:1.10.1rc1
eggdrop:develop
eggdrop:latest
diff --git a/eggdrop_latest/Dockerfile b/eggdrop_latest/Dockerfile
index 498692b..f402ef9 100644
--- a/eggdrop_latest/Dockerfile
+++ b/eggdrop_latest/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.20
+FROM alpine:3.21
LABEL org.opencontainers.image.authors="Geo Van O <[email protected]>" \
org.opencontainers.image.url="https://www.eggheads.org"
@@ -8,35 +8,32 @@ RUN addgroup -S -g 3333 eggdrop \
# grab su-exec for easy step-down from root
RUN apk add --no-cache 'su-exec>=0.2' bash openssl
-RUN apk add --no-cache --virtual egg-deps wget ca-certificates make tar gnupg build-base openssl-dev \
- && wget "https://prdownloads.sourceforge.net/tcl/tcl8.6.13-src.tar.gz" -O tcl8.6.13-src.tar.gz --progress=dot:giga \
- && tar -zxf tcl8.6.13-src.tar.gz \
- && ( cd tcl8.6.13 \
-# Fix Tcl UTF Emoji support
- && sed -i "/define TCL_UTF_MAX/c\#define TCL_UTF_MAX 6" generic/tcl.h \
+RUN apk add --no-cache --virtual egg-deps wget ca-certificates make tar gnupg build-base openssl-dev bsd-compat-headers zlib-dev \
+ && wget "https://prdownloads.sourceforge.net/tcl/tcl9.0.1-src.tar.gz" -O tcl9.0.1-src.tar.gz --progress=dot:giga \
+ && tar -zxf tcl9.0.1-src.tar.gz \
+ && ( cd tcl9.0.1 \
&& cd unix \
&& ./configure \
&& nproc="$(nproc)" \
&& make -j"$nproc" \
&& make install ) \
- && rm -rf tcl8.6.13-src.tar.gz \
- && rm -rf tcl8.6.13 \
- && wget ftp://ftp.eggheads.org/pub/eggdrop/source/1.10/eggdrop-1.10.0.tar.gz \
- && wget ftp://ftp.eggheads.org/pub/eggdrop/source/1.10/eggdrop-1.10.0.tar.gz.asc \
- && gpg --keyserver keyserver.ubuntu.com --recv-key E01C240484DE7DBE190FE141E7667DE1D1A39AFF \
- && gpg --batch --verify eggdrop-1.10.0.tar.gz.asc eggdrop-1.10.0.tar.gz \
- && command -v gpgconf > /dev/null \
+ && rm -rf tcl9.0.1-src.tar.gz \
+ && rm -rf tcl9.0.1 \
+ && wget ftp://ftp.eggheads.org/pub/eggdrop/source/1.10/eggdrop-1.10.1.tar.gz \
+ && wget ftp://ftp.eggheads.org/pub/eggdrop/source/1.10/eggdrop-1.10.1.tar.gz.asc \
+ && gpg --batch --keyserver keyserver.ubuntu.com --recv-key E01C240484DE7DBE190FE141E7667DE1D1A39AFF \
+ && gpg --batch --verify eggdrop-1.10.1.tar.gz.asc eggdrop-1.10.1.tar.gz \
&& gpgconf --kill all \
- && rm eggdrop-1.10.0.tar.gz.asc \
- && tar -zxvf eggdrop-1.10.0.tar.gz \
- && rm eggdrop-1.10.0.tar.gz \
- && ( cd eggdrop-1.10.0 \
+ && rm eggdrop-1.10.1.tar.gz.asc \
+ && tar -zxvf eggdrop-1.10.1.tar.gz \
+ && rm eggdrop-1.10.1.tar.gz \
+ && ( cd eggdrop-1.10.1 \
&& ./configure \
&& make config \
&& nproc="$(nproc)" \
&& make -j"$nproc" \
&& make install DEST=/home/eggdrop/eggdrop ) \
- && rm -rf eggdrop-1.10 \
+ && rm -rf eggdrop-1.10.1 \
&& mkdir /home/eggdrop/eggdrop/data \
&& chown -R eggdrop /home/eggdrop/eggdrop \
&& apk del --no-network egg-deps
Relevant Maintainers:
-
eggdrop: @vanosg
I think you need to rebase on our latest master (and perhaps in the future open your PR branches from our HEAD instead of your fork's) so that the delete of 1.10.1rc1 actually takes. :eyes:
For this PR, the easy mode might be something like git fetch https://github.com/docker-library/official-images.git HEAD: && git reset --hard FETCH_HEAD && git cherry-pick 4d57a65b0c1d8c18325e8955538e0e18373c140e && git push --force (since 4d57a65b0c1d8c18325e8955538e0e18373c140e is the only commit you actually want here, and it should apply cleanly on our HEAD).