@@ -99,23 +99,23 @@ ARG target_arch=x86_64-linux-gnu
99
99
ARG target_arch_gcc=x86-64-linux-gnu
100
100
ARG target_arch_dpkg=amd64
101
101
ARG target_arch_rust=x86_64-unknown-linux-gnu
102
- ARG target_arch_cflags= x86-64
102
+ ARG COPTFLAGS= "-march= x86-64"
103
103
104
104
FROM base-builder AS base-builder-linux-arm64
105
105
106
106
ARG target_arch=aarch64-linux-gnu
107
107
ARG target_arch_gcc=aarch64-linux-gnu
108
108
ARG target_arch_dpkg=arm64
109
109
ARG target_arch_rust=aarch64-unknown-linux-gnu
110
- ARG target_arch_cflags= armv8-a
110
+ ARG COPTFLAGS= "-march= armv8-a"
111
111
112
112
FROM base-builder AS base-builder-linux-arm
113
113
114
114
ARG target_arch=arm-linux-gnueabihf
115
115
ARG target_arch_gcc=arm-linux-gnueabihf
116
116
ARG target_arch_dpkg=armhf
117
117
ARG target_arch_rust=armv7-unknown-linux-gnueabihf
118
- ARG target_arch_cflags= armv7-a
118
+ ARG COPTFLAGS= "-march= armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"
119
119
120
120
FROM base-builder-${TARGETOS}-${TARGETARCH} AS builder
121
121
@@ -140,7 +140,7 @@ ARG CXX=${target_arch}-g++
140
140
ARG LD=${target_arch}-ld
141
141
ARG STRIP=${target_arch}-strip
142
142
ARG TARGET=${target_arch_rust}
143
- ARG COPTFLAGS="-O2 -march=${target_arch_cflags }"
143
+ ARG COPTFLAGS="-O2 ${COPTFLAGS }"
144
144
145
145
WORKDIR /opt
146
146
@@ -157,12 +157,17 @@ linker = "${target_arch}-gcc"
157
157
rustflags = ["-C" , "target-cpu=generic" ]
158
158
EOF
159
159
160
+ # TODO: Fix unaligned access on armv7
160
161
RUN ./configure --prefix=/tmp/lightning_install --enable-static --disable-compat --disable-valgrind
161
162
COPY .git/ .git/
162
163
RUN git submodule update --init --recursive --jobs $(nproc) --depth 1
163
164
RUN uv run make -j$(nproc) install
164
165
165
- RUN ${STRIP} --strip-unneeded #TODO: fix
166
+ RUN for f in /tmp/lightning_install/bin/*; do \
167
+ if file "$f" | grep -q 'ELF' ; then \
168
+ ${STRIP} --strip-unneeded "$f" ; \
169
+ fi; \
170
+ done
166
171
167
172
FROM base-target AS final
168
173
@@ -177,7 +182,7 @@ RUN apt-get update && \
177
182
178
183
COPY --from=downloader /opt/bitcoin/bin/bitcoin-cli /usr/bin/
179
184
COPY --from=downloader /opt/litecoin/bin/litecoin-cli /usr/bin/
180
- COPY --from=builder /tmp/lightning_install /usr/local/
185
+ COPY --from=builder /tmp/lightning_install/ /usr/local/
181
186
182
187
COPY tools/docker-entrypoint.sh /entrypoint.sh
183
188
0 commit comments