Skip to content

Commit c9ed187

Browse files
author
Claudio Raimondi
committed
Fix compilation issues [skip ci]
1 parent 936a727 commit c9ed187

File tree

1 file changed

+8
-18
lines changed

1 file changed

+8
-18
lines changed

Dockerfile

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ RUN apt-get update -qq && \
1717
apt-get install -qq -y --no-install-recommends \
1818
gnupg
1919

20-
# -------------- Bitcoin --------------------
21-
2220
ARG BITCOIN_VERSION=27.1
2321
ARG BITCOIN_URL=https://bitcoincore.org/bin/bitcoin-core-${BITCOIN_VERSION}
2422
ARG BITCOIN_TARBALL=bitcoin-${BITCOIN_VERSION}-${TARBALL_ARCH_FINAL}.tar.gz
@@ -36,8 +34,6 @@ RUN gpg --import gpg/* && \
3634

3735
RUN tar xzf ${BITCOIN_TARBALL} --strip-components=1
3836

39-
# -------------- Litecoin -------------------
40-
4137
ARG LITECOIN_VERSION=0.16.3
4238
ARG LITECOIN_BASE_URL=https://download.litecoin.org/litecoin-${LITECOIN_VERSION}
4339
ARG LITECOIN_URL=${LITECOIN_BASE_URL}/linux
@@ -61,13 +57,15 @@ FROM ${BASE_DISTRO} AS base-builder
6157

6258
RUN apt-get update -qq && \
6359
apt-get install -qq -y --no-install-recommends \
60+
build-essential \
6461
ca-certificates \
6562
git \
6663
gnupg \
6764
wget \
68-
python3
69-
70-
# -------------- Zlib ----------------------
65+
python3 \
66+
autoconf \
67+
automake \
68+
libicu-dev
7169

7270
ARG ZLIB_URL=https://github.com/madler/zlib/releases/download
7371
ARG ZLIB_VERSION=1.2.13
@@ -84,8 +82,6 @@ RUN gpg --import gpg/* && \
8482

8583
#TODO: verify checksum
8684

87-
# -------------- SQLite --------------------
88-
8985
ARG SQLITE_URL=https://www.sqlite.org
9086
ARG SQLITE_YEAR=2019
9187
ARG SQLITE_VERSION=3290000
@@ -99,8 +95,6 @@ ADD ${SQLITE_URL}/${SQLITE_YEAR}/${SQLITE_TARBALL} .
9995

10096
#TODO verify gpgs
10197

102-
# -------------- Postgres ------------------
103-
10498
ARG POSTGRES_URL=https://ftp.postgresql.org/pub/source
10599
ARG POSTGRES_VERSION=17.1
106100
ARG POSTGRES_TARBALL=postgresql-${POSTGRES_VERSION}.tar.gz
@@ -115,13 +109,9 @@ ADD ${POSTGRES_URL}/v${POSTGRES_VERSION}/${POSTGRES_TARBALL}.sha256 .
115109

116110
RUN sha256sum -c ${POSTGRES_TARBALL}.sha256
117111

118-
# -------------- Scripts ----------------------
119-
120112
ADD --chmod=750 https://sh.rustup.rs /opt/install-rust.sh
121113
ADD --chmod=750 https://install.python-poetry.org /opt/install-poetry.py
122114

123-
# -------------- Core Lightning --------------
124-
125115
WORKDIR /opt/lightningd
126116

127117
COPY . .
@@ -169,21 +159,21 @@ RUN rustup toolchain install stable --component rustfmt --allow-downgrade
169159

170160
WORKDIR /opt/zlib
171161

172-
RUN tar xzf /opt/${ZLIB_TARBALL} --strip-components=1
162+
RUN tar xzf ${ZLIB_TARBALL} --strip-components=1
173163
RUN ./configure --prefix=${QEMU_LD_PREFIX}
174164
RUN make -j
175165
RUN make install
176166

177167
WORKDIR /opt/sqlite
178168

179-
RUN tar xzf /opt/${SQLITE_TARBALL} --strip-components=1
169+
RUN tar xzf ${SQLITE_TARBALL} --strip-components=1
180170
RUN ./configure --host=${target_host} --prefix=${QEMU_LD_PREFIX} --enable-static --disable-readline --disable-threadsafe --disable-load-extension
181171
RUN make -j
182172
RUN make install
183173

184174
WORKDIR /opt/postgres
185175

186-
RUN tar xzf /opt/${POSTGRES_TARBALL} --strip-components=1
176+
RUN tar xzf ${POSTGRES_TARBALL} --strip-components=1
187177
RUN ./configure --prefix=${QEMU_LD_PREFIX} --without-readline
188178
RUN make install -C src/include
189179
RUN make install -C src/interfaces/libpq

0 commit comments

Comments
 (0)