From 53393ee1680cf1e9ab33e4f967f3d109b6447d78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Paulo?= Date: Tue, 17 Dec 2024 11:38:54 +0000 Subject: [PATCH] Remove support for dashcore@0.12 --- .github/workflows/build.yaml | 2 - 0.12/Dockerfile | 50 ------------- 0.12/alpine/Dockerfile | 119 ------------------------------- 0.12/alpine/docker-entrypoint.sh | 26 ------- 0.12/docker-entrypoint.sh | 26 ------- README.md | 2 - 6 files changed, 225 deletions(-) delete mode 100644 0.12/Dockerfile delete mode 100644 0.12/alpine/Dockerfile delete mode 100755 0.12/alpine/docker-entrypoint.sh delete mode 100755 0.12/docker-entrypoint.sh diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 4b51653..2d0dd6d 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -15,8 +15,6 @@ jobs: - '0.16' - '0.15' - '0.14' - - '0.12' - - '0.12/alpine' fail-fast: false steps: - name: Set up Docker Buildx diff --git a/0.12/Dockerfile b/0.12/Dockerfile deleted file mode 100644 index 071a13d..0000000 --- a/0.12/Dockerfile +++ /dev/null @@ -1,50 +0,0 @@ -FROM debian:stable-slim - -LABEL maintainer.0="João Fonseca (@joaopaulofonseca)" \ - maintainer.1="Pedro Branco (@pedrobranco)" \ - maintainer.2="Rui Marinho (@ruimarinho)" - -RUN useradd -r dash \ - && apt-get update -y \ - && apt-get install -y curl gnupg unzip \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \ - && set -ex \ - && for key in \ - B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - 4B88269ABD8DF332 \ - ; do \ - gpg --keyserver keyserver.ubuntu.com --recv-keys "$key" || \ - gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ - gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ - gpg --keyserver keys.openpgp.org --recv-keys "$key" ; \ - done - -ENV GOSU_VERSION=1.10 - -RUN curl -o /usr/local/bin/gosu -fSL https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-$(dpkg --print-architecture) \ - && curl -o /usr/local/bin/gosu.asc -fSL https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-$(dpkg --print-architecture).asc \ - && gpg --verify /usr/local/bin/gosu.asc \ - && rm /usr/local/bin/gosu.asc \ - && chmod +x /usr/local/bin/gosu - -ENV DASH_VERSION=0.12.2.3 -ENV DASH_FOLDER_VERSION=0.12.2 -ENV DASH_DATA=/home/dash/.dashcore \ - PATH=/opt/dashcore-${DASH_FOLDER_VERSION}/bin:$PATH -RUN curl -SLO https://github.com/dashpay/dash/releases/download/v${DASH_VERSION}/SHA256SUMS.asc \ - && curl -SLO https://github.com/dashpay/dash/releases/download/v${DASH_VERSION}/dashcore-${DASH_VERSION}-linux64.tar.gz \ - && curl -SLO https://github.com/dashpay/dash/releases/download/v${DASH_VERSION}/dashcore-${DASH_VERSION}-linux64.tar.gz.asc \ - && gpg --verify dashcore-${DASH_VERSION}-linux64.tar.gz.asc \ - && tar -xzf dashcore-${DASH_VERSION}-linux64.tar.gz -C /opt \ - && rm *.tar.gz - -VOLUME ["/home/dash/.dashcore"] - -COPY docker-entrypoint.sh /entrypoint.sh - -ENTRYPOINT ["/entrypoint.sh"] - -EXPOSE 9998 9999 18332 19998 19999 - -CMD ["dashd"] diff --git a/0.12/alpine/Dockerfile b/0.12/alpine/Dockerfile deleted file mode 100644 index e259bba..0000000 --- a/0.12/alpine/Dockerfile +++ /dev/null @@ -1,119 +0,0 @@ -# Build stage for BerkeleyDB -FROM alpine as berkeleydb - -RUN apk --no-cache add autoconf -RUN apk --no-cache add automake -RUN apk --no-cache add build-base -RUN apk --no-cache add libressl - -ENV BERKELEYDB_VERSION=db-4.8.30.NC -ENV BERKELEYDB_PREFIX=/opt/${BERKELEYDB_VERSION} - -RUN wget https://download.oracle.com/berkeley-db/${BERKELEYDB_VERSION}.tar.gz -RUN tar -xzf *.tar.gz -RUN sed s/__atomic_compare_exchange/__atomic_compare_exchange_db/g -i ${BERKELEYDB_VERSION}/dbinc/atomic.h -RUN mkdir -p ${BERKELEYDB_PREFIX} - -WORKDIR /${BERKELEYDB_VERSION}/build_unix - -RUN ../dist/configure --enable-cxx --disable-shared --with-pic --prefix=${BERKELEYDB_PREFIX} -RUN make -j4 -RUN make install -RUN rm -rf ${BERKELEYDB_PREFIX}/docs - -# Build stage for Dash -FROM alpine:3.12.1 as dash - -COPY --from=berkeleydb /opt /opt - -RUN apk --no-cache add autoconf -RUN apk --no-cache add automake -RUN apk --no-cache add boost-dev -RUN apk --no-cache add build-base -RUN apk --no-cache add chrpath -RUN apk --no-cache add file -RUN apk --no-cache add gnupg -RUN apk --no-cache add libevent-dev -RUN apk --no-cache add libressl -RUN apk --no-cache add libressl-dev -RUN apk --no-cache add libsodium-dev -RUN apk --no-cache add libtool -RUN apk --no-cache add linux-headers -RUN apk --no-cache add protobuf-dev -RUN apk --no-cache add zeromq-dev - -RUN set -ex \ - && for key in \ - 38EE12EB597B4FC0 \ - ; do \ - gpg --keyserver keyserver.ubuntu.com --recv-keys "$key" || \ - gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ - gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ - gpg --keyserver keys.openpgp.org --recv-keys "$key" ; \ - done - -ENV DASH_VERSION=0.12.2.3 -ENV DASH_PREFIX=/opt/dash-${DASH_VERSION} -ENV DASH_SHASUM="7f7d4429f08c2df8819ae8273402eed67d605e183aee6b02202032b57a136c0b v${DASH_VERSION}.tar.gz" - -RUN wget https://github.com/dashpay/dash/archive/v${DASH_VERSION}.tar.gz -RUN echo "${DASH_SHASUM}" | sha256sum -c -RUN tar -xzf *.tar.gz -RUN ls -la - -WORKDIR /dash-${DASH_VERSION} - -RUN sed -i '/AC_PREREQ/a\AR_FLAGS=cr' src/univalue/configure.ac -RUN sed -i '/AX_PROG_CC_FOR_BUILD/a\AR_FLAGS=cr' src/secp256k1/configure.ac -RUN sed -i s:sys/fcntl.h:fcntl.h: src/compat.h -RUN ./autogen.sh -RUN ./configure LDFLAGS=-L`ls -d /opt/db*`/lib/ CPPFLAGS=-I`ls -d /opt/db*`/include/ \ - --prefix=${DASH_PREFIX} \ - --mandir=/usr/share/man \ - --disable-tests \ - --disable-bench \ - --disable-ccache \ - --with-gui=no \ - --with-utils \ - --with-libs \ - --with-daemon -RUN make -j4 -RUN make install -RUN strip ${DASH_PREFIX}/bin/dash-cli -RUN strip ${DASH_PREFIX}/bin/dash-tx -RUN strip ${DASH_PREFIX}/bin/dashd -RUN strip ${DASH_PREFIX}/lib/libdashconsensus.a -RUN strip ${DASH_PREFIX}/lib/libdashconsensus.so.0.0.0 - -# Build stage for compiled artifacts -FROM alpine - -LABEL maintainer.0="João Fonseca (@joaopaulofonseca)" \ - maintainer.1="Pedro Branco (@pedrobranco)" \ - maintainer.2="Rui Marinho (@ruimarinho)" - -RUN adduser -S dash -RUN apk --no-cache add \ - boost \ - boost-program_options \ - curl \ - libevent \ - libressl \ - libzmq \ - su-exec - -ENV DASH_DATA=/home/dash/.dashcore -ENV DASH_VERSION=0.12.2.3 -ENV DASH_PREFIX=/opt/dash-${DASH_VERSION} -ENV PATH=${DASH_PREFIX}/bin:$PATH - -COPY --from=dash /opt /opt -COPY docker-entrypoint.sh /entrypoint.sh - -VOLUME ["/home/dash/.dashcore"] - -EXPOSE 9998 9999 18332 19998 19999 - -ENTRYPOINT ["/entrypoint.sh"] - -CMD ["dashd"] diff --git a/0.12/alpine/docker-entrypoint.sh b/0.12/alpine/docker-entrypoint.sh deleted file mode 100755 index f88a7b7..0000000 --- a/0.12/alpine/docker-entrypoint.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -set -e - -if [ $(echo "$1" | cut -c1) = "-" ]; then - echo "$0: assuming arguments for dashd" - - set -- dashd "$@" -fi - -if [ $(echo "$1" | cut -c1) = "-" ] || [ "$1" = "dashd" ]; then - mkdir -p "$DASH_DATA" - chmod 700 "$DASH_DATA" - chown -R dash "$DASH_DATA" - - echo "$0: setting data directory to $DASH_DATA" - - set -- "$@" -datadir="$DASH_DATA" -fi - -if [ "$1" = "dashd" ] || [ "$1" = "dash-cli" ] || [ "$1" = "dash-tx" ]; then - echo - exec su-exec dash "$@" -fi - -echo -exec "$@" diff --git a/0.12/docker-entrypoint.sh b/0.12/docker-entrypoint.sh deleted file mode 100755 index 8ef60ac..0000000 --- a/0.12/docker-entrypoint.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -set -e - -if [ $(echo "$1" | cut -c1) = "-" ]; then - echo "$0: assuming arguments for dashd" - - set -- dashd "$@" -fi - -if [ $(echo "$1" | cut -c1) = "-" ] || [ "$1" = "dashd" ]; then - mkdir -p "$DASH_DATA" - chmod 700 "$DASH_DATA" - chown -R dash "$DASH_DATA" - - echo "$0: setting data directory to $DASH_DATA" - - set -- "$@" -datadir="$DASH_DATA" -fi - -if [ "$1" = "dashd" ] || [ "$1" = "dash-cli" ] || [ "$1" = "dash-tx" ]; then - echo - exec gosu dash "$@" -fi - -echo -exec "$@" diff --git a/README.md b/README.md index 046e88b..3ff9d32 100644 --- a/README.md +++ b/README.md @@ -14,8 +14,6 @@ A Dash Core docker image. - `0.15.0.0`, `0.15` ([0.15/Dockerfile](https://github.com/uphold/docker-dash-core/blob/master/0.15/Dockerfile)) - `0.14.0.5-alpine`, `0.14-alpine`, `alpine` ([0.14/alpine/Dockerfile](https://github.com/uphold/docker-dash-core/blob/master/0.14/alpine/Dockerfile)) - `0.14.0.5`, `0.14` ([0.14/Dockerfile](https://github.com/uphold/docker-dash-core/blob/master/0.14/Dockerfile)) -- `0.12.2.3-alpine`, `0.12-alpine` ([0.12/alpine/Dockerfile](https://github.com/uphold/docker-dash-core/blob/master/0.12/alpine/Dockerfile)) -- `0.12.2.3`, `0.12` ([0.12/Dockerfile](https://github.com/uphold/docker-dash-core/blob/master/0.12/Dockerfile)) ## What is Dash? _from [dashwiki](https://github.com/dashpay/dash/wiki)_