@@ -131,22 +131,21 @@ RUN apt-get install -qq -y --no-install-recommends \
131131 g++-${target_host}
132132
133133ENV AR=${target_host}-ar \
134- AS=${target_host}-as \
135- CC=${target_host}-gcc \
136- CXX=${target_host}-g++ \
137- LD=${target_host}-ld \
138- STRIP=${target_host}-strip \
139- QEMU_LD_PREFIX=/usr/${target_host} \
140- HOST=${target_host} \
141- TARGET=${target_host_rust} \
142- RUSTUP_INSTALL_OPTS="--target ${target_host_rust} --default-host ${target_host_rust}" \
143- PKG_CONFIG_PATH="/usr/${target_host}/lib/pkgconfig"
144-
145- ENV \
146- ZLIB_CONFIG="--prefix=${QEMU_LD_PREFIX}" \
147- SQLITE_CONFIG="--host=${target_host} --prefix=${QEMU_LD_PREFIX}" \
148- POSTGRES_CONFIG="--without-readline --prefix=${QEMU_LD_PREFIX}" \
149- PG_CONFIG="${QEMU_LD_PREFIX}/bin/pg_config"
134+ AS=${target_host}-as \
135+ CC=${target_host}-gcc \
136+ CXX=${target_host}-g++ \
137+ LD=${target_host}-ld \
138+ STRIP=${target_host}-strip \
139+ QEMU_LD_PREFIX=/usr/${target_host} \
140+ HOST=${target_host} \
141+ TARGET=${target_host_rust} \
142+ RUSTUP_INSTALL_OPTS="--target ${target_host_rust} --default-host ${target_host_rust}" \
143+ PKG_CONFIG_PATH="/usr/${target_host}/lib/pkgconfig"
144+
145+ ENV ZLIB_CONFIG="--prefix=${QEMU_LD_PREFIX}" \
146+ SQLITE_CONFIG="--host=${target_host} --prefix=${QEMU_LD_PREFIX}" \
147+ POSTGRES_CONFIG="--without-readline --prefix=${QEMU_LD_PREFIX}" \
148+ PG_CONFIG="${QEMU_LD_PREFIX}/bin/pg_config"
150149
151150FROM base-builder AS base-builder-linux-arm
152151
@@ -160,22 +159,21 @@ RUN apt-get install -qq -y --no-install-recommends \
160159 g++-${target_host}
161160
162161ENV AR=${target_host}-ar \
163- AS=${target_host}-as \
164- CC=${target_host}-gcc \
165- CXX=${target_host}-g++ \
166- LD=${target_host}-ld \
167- STRIP=${target_host}-strip \
168- QEMU_LD_PREFIX=/usr/${target_host} \
169- HOST=${target_host} \
170- TARGET=${target_host_rust} \
171- RUSTUP_INSTALL_OPTS="--target ${target_host_rust} --default-host ${target_host_rust}" \
172- PKG_CONFIG_PATH="/usr/${target_host}/lib/pkgconfig"
173-
174- ENV \
175- ZLIB_CONFIG="--prefix=${QEMU_LD_PREFIX}" \
176- SQLITE_CONFIG="--host=${target_host} --prefix=${QEMU_LD_PREFIX}" \
177- POSTGRES_CONFIG="--without-readline --prefix=${QEMU_LD_PREFIX}" \
178- PG_CONFIG="${QEMU_LD_PREFIX}/bin/pg_config"
162+ AS=${target_host}-as \
163+ CC=${target_host}-gcc \
164+ CXX=${target_host}-g++ \
165+ LD=${target_host}-ld \
166+ STRIP=${target_host}-strip \
167+ QEMU_LD_PREFIX=/usr/${target_host} \
168+ HOST=${target_host} \
169+ TARGET=${target_host_rust} \
170+ RUSTUP_INSTALL_OPTS="--target ${target_host_rust} --default-host ${target_host_rust}" \
171+ PKG_CONFIG_PATH="/usr/${target_host}/lib/pkgconfig"
172+
173+ ENV ZLIB_CONFIG="--prefix=${QEMU_LD_PREFIX}" \
174+ SQLITE_CONFIG="--host=${target_host} --prefix=${QEMU_LD_PREFIX}" \
175+ POSTGRES_CONFIG="--without-readline --prefix=${QEMU_LD_PREFIX}" \
176+ PG_CONFIG="${QEMU_LD_PREFIX}/bin/pg_config"
179177
180178FROM base-builder-${TARGETOS}-${TARGETARCH} AS builder
181179
@@ -212,8 +210,8 @@ RUN mkdir postgres && tar xvf postgres.tar.gz -C postgres --strip-components=1 \
212210# Save libpq to a specific location to copy it into the final image.
213211RUN mkdir /var/libpq && cp -a "$(${PG_CONFIG} --libdir)" /libpq.* /var/libpq
214212
215- ENV RUST_PROFILE=release
216- ENV PATH="/root/.cargo/bin:/root/.local/bin:$PATH"
213+ ENV RUST_PROFILE=release \
214+ PATH="/root/.cargo/bin:/root/.local/bin:$PATH"
217215RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y ${RUSTUP_INSTALL_OPTS}
218216RUN rustup toolchain install stable --component rustfmt --allow-downgrade
219217
@@ -305,10 +303,10 @@ RUN apt-get update && \
305303 apt-get clean && \
306304 rm -rf /var/lib/apt/lists/*
307305
308- ENV LIGHTNINGD_DATA=/root/.lightning
309- ENV LIGHTNINGD_RPC_PORT=9835
310- ENV LIGHTNINGD_PORT=9735
311- ENV LIGHTNINGD_NETWORK=bitcoin
306+ ENV LIGHTNINGD_DATA=/root/.lightning \
307+ LIGHTNINGD_RPC_PORT=9835 \
308+ LIGHTNINGD_PORT=9735 \
309+ LIGHTNINGD_NETWORK=bitcoin
312310
313311RUN mkdir $LIGHTNINGD_DATA && \
314312 touch $LIGHTNINGD_DATA/config
0 commit comments