@@ -57,6 +57,16 @@ RUN gpg --import gpg/* && \
57
57
58
58
RUN tar xzf ${LITECOIN_TARBALL} --strip-components=1
59
59
60
+ FROM ${BASE_DISTRO} AS base-builder
61
+
62
+ RUN apt-get update -qq && \
63
+ apt-get install -qq -y --no-install-recommends \
64
+ ca-certificates \
65
+ git \
66
+ gnupg \
67
+ wget \
68
+ python3
69
+
60
70
# -------------- Zlib ----------------------
61
71
62
72
ARG ZLIB_URL=https://github.com/madler/zlib/releases/download
@@ -65,13 +75,14 @@ ARG ZLIB_TARBALL=zlib-${ZLIB_VERSION}.tar.gz
65
75
66
76
WORKDIR /opt/zlib
67
77
68
- ADD ${ZLIB_URL}/v${ZLIB_VERSION}/${ZLIB_TARBALL} zlib.tar.gz
69
- ADD ${ZLIB_URL}/v${ZLIB_VERSION}/${ZLIB_TARBALL}.asc zlib.tar.gz.asc
78
+ ADD ${ZLIB_URL}/v${ZLIB_VERSION}/${ZLIB_TARBALL} .
79
+ ADD ${ZLIB_URL}/v${ZLIB_VERSION}/${ZLIB_TARBALL}.asc .
70
80
COPY gpg/zlib/ gpg/
71
81
72
82
RUN gpg --import gpg/* && \
73
- gpg --verify zlib.tar.gz.asc zlib.tar.gz && \
74
- sha256sum -c zlib.tar.gz.sha256 --ignore-missing
83
+ gpg --verify ${ZLIB_TARBALL}.asc ${ZLIB_TARBALL}
84
+
85
+ # TODO: verify checksum
75
86
76
87
# -------------- SQLite --------------------
77
88
@@ -82,7 +93,7 @@ ARG SQLITE_TARBALL=sqlite-autoconf-${SQLITE_VERSION}.tar.gz
82
93
83
94
WORKDIR /opt/sqlite
84
95
85
- ADD ${SQLITE_URL}/${SQLITE_YEAR}/${SQLITE_TARBALL} sqlite.tar.gz
96
+ ADD ${SQLITE_URL}/${SQLITE_YEAR}/${SQLITE_TARBALL} .
86
97
# TODO: add sig
87
98
# TODO: add gpgs
88
99
@@ -96,18 +107,17 @@ ARG POSTGRES_TARBALL=postgresql-${POSTGRES_VERSION}.tar.gz
96
107
97
108
WORKDIR /opt/postgres
98
109
99
- ADD ${POSTGRES_URL}/v${POSTGRES_VERSION}/${POSTGRES_TARBALL} postgres.tar.gz
100
- ADD ${POSTGRES_URL}/v${POSTGRES_VERSION}/${POSTGRES_TARBALL}.sha256 postgres.tar.gz.sha256
110
+ ADD ${POSTGRES_URL}/v${POSTGRES_VERSION}/${POSTGRES_TARBALL} .
111
+ ADD ${POSTGRES_URL}/v${POSTGRES_VERSION}/${POSTGRES_TARBALL}.sha256 .
101
112
# TODO: add gpgs
102
113
103
114
# TODO verify gpgs
104
115
105
- RUN sha256sum -c postgres.tar.gz .sha256
116
+ RUN sha256sum -c ${POSTGRES_TARBALL} .sha256
106
117
107
- # -------------- Rust ----------------------
108
- ADD --chmod=750 https://sh.rustup.rs /opt/install-rust.sh
118
+ # -------------- Scripts ----------------------
109
119
110
- # -------------- Poetry --------------------
120
+ ADD --chmod=750 https://sh.rustup.rs /opt/install-rust.sh
111
121
ADD --chmod=750 https://install.python-poetry.org /opt/install-poetry.py
112
122
113
123
# -------------- Core Lightning --------------
@@ -118,29 +128,6 @@ COPY . .
118
128
119
129
RUN git submodule update --init --recursive
120
130
121
- WORKDIR /opt
122
-
123
- FROM ${BASE_DISTRO} AS base-builder
124
-
125
- RUN apt-get update -qq && \
126
- apt-get install -qq -y --no-install-recommends \
127
- ca-certificates \
128
- python3 \
129
- git \
130
- autoconf \
131
- automake \
132
- libtool \
133
- build-essential \
134
- pkg-config \
135
- libicu-dev \
136
- bison \
137
- flex \
138
- wget \
139
- jq \
140
- gettext \
141
- qemu-user-static \
142
- protobuf-compiler
143
-
144
131
FROM base-builder AS base-builder-linux-amd64
145
132
146
133
ARG target_host=x86_64-linux-gnu
@@ -182,21 +169,21 @@ RUN rustup toolchain install stable --component rustfmt --allow-downgrade
182
169
183
170
WORKDIR /opt/zlib
184
171
185
- RUN tar xzf /opt/zlib.tar.gz --strip-components=1
172
+ RUN tar xzf /opt/${ZLIB_TARBALL} --strip-components=1
186
173
RUN ./configure --prefix=${QEMU_LD_PREFIX}
187
174
RUN make -j
188
175
RUN make install
189
176
190
177
WORKDIR /opt/sqlite
191
178
192
- RUN tar xzf /opt/sqlite.tar.gz --strip-components=1
179
+ RUN tar xzf /opt/${SQLITE_TARBALL} --strip-components=1
193
180
RUN ./configure --host=${target_host} --prefix=${QEMU_LD_PREFIX} --enable-static --disable-readline --disable-threadsafe --disable-load-extension
194
181
RUN make -j
195
182
RUN make install
196
183
197
184
WORKDIR /opt/postgres
198
185
199
- RUN tar xzf /opt/postgres.tar.gz --strip-components=1
186
+ RUN tar xzf /opt/${POSTGRES_TARBALL} --strip-components=1
200
187
RUN ./configure --prefix=${QEMU_LD_PREFIX} --without-readline
201
188
RUN make install -C src/include
202
189
RUN make install -C src/interfaces/libpq
0 commit comments