From 0f094f8d656a406c16fbca397444bc24b87b8803 Mon Sep 17 00:00:00 2001 From: gruve-p Date: Wed, 13 Dec 2023 18:12:30 +0100 Subject: [PATCH] Try fixup alpine builds --- 2.21/alpine/Dockerfile | 10 +++++----- 22/alpine/Dockerfile | 8 ++++---- 23/alpine/Dockerfile | 13 ++++++------- 24/alpine/Dockerfile | 9 +++------ 25/alpine/Dockerfile | 3 --- 26/alpine/Dockerfile | 3 --- 6 files changed, 18 insertions(+), 28 deletions(-) diff --git a/2.21/alpine/Dockerfile b/2.21/alpine/Dockerfile index 6405c0d..60cb233 100644 --- a/2.21/alpine/Dockerfile +++ b/2.21/alpine/Dockerfile @@ -1,5 +1,5 @@ # Build stage for BerkeleyDB -FROM alpine as berkeleydb +FROM alpine:3.13.0 as berkeleydb RUN sed -i 's/http\:\/\/dl-cdn.alpinelinux.org/https\:\/\/alpine.global.ssl.fastly.net/g' /etc/apk/repositories RUN apk --no-cache add autoconf @@ -19,13 +19,13 @@ RUN mkdir -p ${BERKELEYDB_PREFIX} WORKDIR /${BERKELEYDB_VERSION}/build_unix -RUN ../dist/configure --enable-cxx --disable-shared --with-pic --prefix=${BERKELEYDB_PREFIX} +RUN ../dist/configure --enable-cxx --disable-shared --with-pic --prefix=${BERKELEYDB_PREFIX} --build=aarch64-unknown-linux-gnu RUN make -j4 RUN make install RUN rm -rf ${BERKELEYDB_PREFIX}/docs # Build stage for Groestlcoin Core -FROM alpine as groestlcoin-core +FROM alpine:3.13.0 as groestlcoin-core COPY --from=berkeleydb /opt /opt @@ -88,7 +88,7 @@ RUN strip ${GROESTLCOIN_PREFIX}/bin/groestlcoind RUN strip ${GROESTLCOIN_PREFIX}/lib/libgroestlcoinconsensus.a RUN strip ${GROESTLCOIN_PREFIX}/lib/libgroestlcoinconsensus.so.0.0.0 -FROM alpine +FROM alpine:3.13.0 ARG UID=100 ARG GID=101 @@ -102,10 +102,10 @@ RUN apk --no-cache add \ boost-filesystem \ boost-system \ boost-thread \ - sqlite-dev \ libevent \ libzmq \ shadow \ + sqlite-dev \ su-exec ENV GROESTLCOIN_DATA=/home/groestlcoin/.groestlcoin diff --git a/22/alpine/Dockerfile b/22/alpine/Dockerfile index 53c7f71..9e5808e 100644 --- a/22/alpine/Dockerfile +++ b/22/alpine/Dockerfile @@ -1,5 +1,5 @@ # Build stage for BerkeleyDB -FROM alpine as berkeleydb +FROM alpine:3.13.0 as berkeleydb RUN sed -i 's/http\:\/\/dl-cdn.alpinelinux.org/https\:\/\/alpine.global.ssl.fastly.net/g' /etc/apk/repositories RUN apk --no-cache add autoconf @@ -19,13 +19,13 @@ RUN mkdir -p ${BERKELEYDB_PREFIX} WORKDIR /${BERKELEYDB_VERSION}/build_unix -RUN ../dist/configure --enable-cxx --disable-shared --with-pic --prefix=${BERKELEYDB_PREFIX} +RUN ../dist/configure --enable-cxx --disable-shared --with-pic --prefix=${BERKELEYDB_PREFIX} --build=aarch64-unknown-linux-gnu RUN make -j4 RUN make install RUN rm -rf ${BERKELEYDB_PREFIX}/docs # Build stage for Groestlcoin Core -FROM alpine as groestlcoin-core +FROM alpine:3.13.0 as groestlcoin-core COPY --from=berkeleydb /opt /opt @@ -89,7 +89,7 @@ RUN strip ${GROESTLCOIN_PREFIX}/bin/groestlcoind RUN strip ${GROESTLCOIN_PREFIX}/lib/libgroestlcoinconsensus.a RUN strip ${GROESTLCOIN_PREFIX}/lib/libgroestlcoinconsensus.so.0.0.0 -FROM alpine +FROM alpine:3.13.0 ARG UID=100 ARG GID=101 diff --git a/23/alpine/Dockerfile b/23/alpine/Dockerfile index c6babf6..0f5669f 100644 --- a/23/alpine/Dockerfile +++ b/23/alpine/Dockerfile @@ -1,7 +1,5 @@ # Build stage for BerkeleyDB -FROM alpine as berkeleydb - -ARG TARGETPLATFORM +FROM alpine:3.13.0 as berkeleydb RUN sed -i 's/http\:\/\/dl-cdn.alpinelinux.org/https\:\/\/alpine.global.ssl.fastly.net/g' /etc/apk/repositories RUN apk --no-cache add autoconf @@ -21,13 +19,13 @@ RUN mkdir -p ${BERKELEYDB_PREFIX} WORKDIR /${BERKELEYDB_VERSION}/build_unix -RUN ../dist/configure --enable-cxx --disable-shared --with-pic --prefix=${BERKELEYDB_PREFIX} +RUN ../dist/configure --enable-cxx --disable-shared --with-pic --prefix=${BERKELEYDB_PREFIX} --build=aarch64-unknown-linux-gnu RUN make -j4 RUN make install RUN rm -rf ${BERKELEYDB_PREFIX}/docs # Build stage for Groestlcoin Core -FROM alpine as groestlcoin-core +FROM alpine:3.13.0 as groestlcoin-core COPY --from=berkeleydb /opt /opt @@ -93,7 +91,7 @@ RUN strip ${GROESTLCOIN_PREFIX}/lib/libgroestlcoinconsensus.a RUN strip ${GROESTLCOIN_PREFIX}/lib/libgroestlcoinconsensus.so.0.0.0 # Build stage for compiled artifacts -FROM alpine +FROM alpine:3.13.0 ARG UID=100 ARG GID=101 @@ -107,9 +105,10 @@ RUN apk --no-cache add \ boost-filesystem \ boost-system \ boost-thread \ - sqlite-dev \ libevent \ libzmq \ + shadow \ + sqlite-dev \ su-exec ENV GROESTLCOIN_DATA=/home/groestlcoin/.groestlcoin diff --git a/24/alpine/Dockerfile b/24/alpine/Dockerfile index bea59c5..54c1c2b 100644 --- a/24/alpine/Dockerfile +++ b/24/alpine/Dockerfile @@ -1,5 +1,5 @@ # Build stage for BerkeleyDB -FROM alpine as berkeleydb +FROM alpine:3.13.0 as berkeleydb RUN sed -i 's/http\:\/\/dl-cdn.alpinelinux.org/https\:\/\/alpine.global.ssl.fastly.net/g' /etc/apk/repositories RUN apk --no-cache add autoconf @@ -25,7 +25,7 @@ RUN make install RUN rm -rf ${BERKELEYDB_PREFIX}/docs # Build stage for Groestlcoin Core -FROM alpine as groestlcoin-core +FROM alpine:3.13.0 as groestlcoin-core COPY --from=berkeleydb /opt /opt @@ -88,7 +88,7 @@ RUN strip ${GROESTLCOIN_PREFIX}/lib/libgroestlcoinconsensus.a RUN strip ${GROESTLCOIN_PREFIX}/lib/libgroestlcoinconsensus.so.0.0.0 # Build stage for compiled artifacts -FROM alpine +FROM alpine:3.13.0 ARG UID=100 ARG GID=101 @@ -99,9 +99,6 @@ RUN addgroup groestlcoin --gid ${GID} --system RUN adduser --uid ${UID} --system groestlcoin --ingroup groestlcoin RUN sed -i 's/http\:\/\/dl-cdn.alpinelinux.org/https\:\/\/alpine.global.ssl.fastly.net/g' /etc/apk/repositories RUN apk --no-cache add \ - boost-filesystem \ - boost-system \ - boost-thread \ libevent \ libzmq \ shadow \ diff --git a/25/alpine/Dockerfile b/25/alpine/Dockerfile index ff946b3..c1a0797 100644 --- a/25/alpine/Dockerfile +++ b/25/alpine/Dockerfile @@ -99,9 +99,6 @@ RUN addgroup groestlcoin --gid ${GID} --system RUN adduser --uid ${UID} --system groestlcoin --ingroup groestlcoin RUN sed -i 's/http\:\/\/dl-cdn.alpinelinux.org/https\:\/\/alpine.global.ssl.fastly.net/g' /etc/apk/repositories RUN apk --no-cache add \ - boost-filesystem \ - boost-system \ - boost-thread \ libevent \ libzmq \ shadow \ diff --git a/26/alpine/Dockerfile b/26/alpine/Dockerfile index 7abb126..7504e91 100644 --- a/26/alpine/Dockerfile +++ b/26/alpine/Dockerfile @@ -99,9 +99,6 @@ RUN addgroup groestlcoin --gid ${GID} --system RUN adduser --uid ${UID} --system groestlcoin --ingroup groestlcoin RUN sed -i 's/http\:\/\/dl-cdn.alpinelinux.org/https\:\/\/alpine.global.ssl.fastly.net/g' /etc/apk/repositories RUN apk --no-cache add \ - boost-filesystem \ - boost-system \ - boost-thread \ libevent \ libzmq \ shadow \