Skip to content

Commit 9046926

Browse files
committed
Merge branch 'master' of https://github.com/lncm/docker-bitcoind
2 parents a558fec + 5d70ce4 commit 9046926

File tree

2 files changed

+1
-14
lines changed

2 files changed

+1
-14
lines changed

24.0/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,8 +217,6 @@ LABEL maintainer="Damian Mee (@meeDamian)"
217217
RUN sed -i 's|http://dl-cdn.alpinelinux.org|https://alpine.global.ssl.fastly.net|g' /etc/apk/repositories
218218

219219
RUN apk add --no-cache \
220-
boost-filesystem \
221-
boost-thread \
222220
libevent \
223221
libsodium \
224222
libstdc++ \

25.0/Dockerfile

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ARG VERSION=25.0
99
ARG ARCH
1010

1111
# Define default versions so that they don't have to be repeated throughout the file
12-
ARG VER_ALPINE=3.12
12+
ARG VER_ALPINE=3.18
1313

1414
# $USER name, and data $DIR to be used in the `final` image
1515
ARG USER=bitcoind
@@ -31,9 +31,6 @@ ARG BDB_SOURCE=prebuilt
3131
#
3232
FROM alpine:${VER_ALPINE} AS preparer-base
3333

34-
# Make sure APKs are downloaded over SSL. See: https://github.com/gliderlabs/docker-alpine/issues/184
35-
RUN sed -i 's|http://dl-cdn.alpinelinux.org|https://alpine.global.ssl.fastly.net|g' /etc/apk/repositories
36-
3734
RUN apk add --no-cache gnupg
3835

3936
# Key source of truth
@@ -140,9 +137,6 @@ FROM ${ARCH:+${ARCH}/}alpine:${VER_ALPINE} AS builder
140137
ARG VERSION
141138
ARG SOURCE
142139

143-
# Use APK repos over HTTPS. See: https://github.com/gliderlabs/docker-alpine/issues/184
144-
RUN sed -i 's|http://dl-cdn.alpinelinux.org|https://alpine.global.ssl.fastly.net|g' /etc/apk/repositories
145-
146140
RUN apk add --no-cache \
147141
autoconf \
148142
automake \
@@ -213,12 +207,7 @@ ARG DIR
213207

214208
LABEL maintainer="Damian Mee (@meeDamian)"
215209

216-
# Use APK repos over HTTPS. See: https://github.com/gliderlabs/docker-alpine/issues/184
217-
RUN sed -i 's|http://dl-cdn.alpinelinux.org|https://alpine.global.ssl.fastly.net|g' /etc/apk/repositories
218-
219210
RUN apk add --no-cache \
220-
boost-filesystem \
221-
boost-thread \
222211
libevent \
223212
libsodium \
224213
libstdc++ \

0 commit comments

Comments
 (0)