@@ -114,8 +114,8 @@ ARG POSTGRES_TARBALL=postgresql-${POSTGRES_VERSION}.tar.gz
114
114
115
115
WORKDIR /opt/postgres
116
116
117
- ADD ${POSTGRES_URL}/v${POSTGRES_VERSION}/${POSTGRES_TARBALL} .
118
- ADD ${POSTGRES_URL}/v${POSTGRES_VERSION}/${POSTGRES_TARBALL}.sha256 .
117
+ ADD ${POSTGRES_URL}/v${POSTGRES_VERSION}/${POSTGRES_TARBALL} .
118
+ ADD ${POSTGRES_URL}/v${POSTGRES_VERSION}/${POSTGRES_TARBALL}.sha256 .
119
119
# TODO: add gpgs
120
120
121
121
# TODO verify gpgs
@@ -129,11 +129,8 @@ ADD --chmod=750 https://sh.rustup.rs install-rust.sh
129
129
130
130
WORKDIR /opt/lightningd
131
131
132
- # TODO: fix docker caching at this stage.
133
132
COPY . .
134
133
135
- RUN git submodule update --init --recursive
136
-
137
134
FROM base-builder AS base-builder-linux-amd64
138
135
139
136
ARG target_host=x86_64-linux-gnu
@@ -226,11 +223,10 @@ RUN apt-get update -qq && \
226
223
apt-get clean && \
227
224
rm -rf /var/lib/apt/lists/*
228
225
229
- # TODO: only copy necessary bitcoin/litecoin binaries.
230
- COPY --from=downloader /opt/bitcoin/bin/ /usr/bin/
231
- COPY --from=downloader /opt/litecoin/bin/ /usr/bin/
232
- COPY --from=builder /tmp/lightning_install/ /usr/local/
233
- COPY --from=builder /tmp/postgres_install/lib/ /usr/lib/
226
+ COPY --from=downloader /opt/bitcoin/bin/bitcoin-cli /usr/bin/
227
+ COPY --from=downloader /opt/litecoin/bin/litecoin-cli /usr/bin/
228
+ COPY --from=builder /tmp/lightning_install/ /usr/local/
229
+ COPY --from=builder /tmp/postgres_install/lib/ /usr/lib/
234
230
235
231
COPY tools/docker-entrypoint.sh /entrypoint.sh
236
232
0 commit comments