Skip to content

Commit c29a6b5

Browse files
committed
fix: RNP sop build
1 parent dfac676 commit c29a6b5

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

Dockerfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ARG TEST_SUITE_REPO=https://gitlab.com/sequoia-pgp/openpgp-interoperability-test
66

77
ARG TEST_SUITE_REF=2273f28f86a7407d71cfac34e4fda0a444b4d42a
88

9-
RUN apt update && apt install -y git rustc cargo clang llvm pkg-config nettle-dev
9+
RUN apt update && apt install -y git rustc cargo clang-15 llvm pkg-config nettle-dev
1010

1111
ENV TEST_SUITE_DIR=/test-suite
1212

@@ -177,7 +177,7 @@ RUN apt update && apt install -y cmake libbz2-dev zlib1g-dev libjson-c-dev build
177177

178178
ENV BOTAN_DIR=/botan
179179

180-
ARG BOTAN_VERSION="2.18.2"
180+
ARG BOTAN_VERSION="2.19.4"
181181

182182
RUN mkdir ${BOTAN_DIR}
183183

@@ -194,16 +194,16 @@ ENV RNP_DIR=/rnp
194194

195195
RUN mkdir ${RNP_DIR}
196196

197-
ARG RNP_VESION="v0.16.2"
197+
ARG RNP_VESION="v0.17.1"
198198

199-
RUN git clone https://github.com/rnpgp/rnp.git -b ${RNP_VESION} ${RNP_DIR}
199+
RUN git clone https://github.com/rnpgp/rnp.git --recurse-submodules --shallow-submodules -b ${RNP_VESION} ${RNP_DIR}
200200

201201
WORKDIR ${RNP_DIR}
202202

203203
RUN mkdir build
204204

205205
RUN cd build && \
206-
cmake -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_SHARED_LIBS=on -DBUILD_TESTING=off ../ && \
206+
cmake -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_SHARED_LIBS=on -DBUILD_TESTING=off .. && \
207207
make && \
208208
make install
209209

@@ -221,13 +221,13 @@ RUN git clone https://gitlab.com/sequoia-pgp/sop-rs.git ${SOP_RS_DIR}
221221

222222
WORKDIR ${SOP_RS_DIR}
223223

224-
ARG SOP_RS_REF=v0.7.1
224+
ARG SOP_RS_REF=v0.6.0
225225

226226
RUN git checkout ${SOP_RS_REF}
227227

228228
ARG RNP_SOP_REPO=https://gitlab.com/sequoia-pgp/rnp-sop.git
229229

230-
ARG RNP_SOP_REF=da6f630c08ecc4f2f6faf31e412e04d4c1d00498
230+
ARG RNP_SOP_REF=242491142047532c92cb1ea94abb5256d388665e
231231

232232
RUN git clone ${RNP_SOP_REPO} ${RNP_SOP_DIR}
233233

0 commit comments

Comments
 (0)