Hackily install new scansion dependency in integration tests
Some checks failed
moparisthebest/xmpp-proxy/pipeline/head There was a failure building this commit
Some checks failed
moparisthebest/xmpp-proxy/pipeline/head There was a failure building this commit
This commit is contained in:
parent
c2e373ef07
commit
051b7bebf6
@ -22,6 +22,8 @@ RUN pacman -S --noconfirm --disable-download-timeout --needed rust cargo git mer
|
|||||||
cd /build/lua52-cjson && su -m -s /bin/bash nobody makepkg && pacman -U --noconfirm --needed lua52-cjson-*.pkg.tar* && \
|
cd /build/lua52-cjson && su -m -s /bin/bash nobody makepkg && pacman -U --noconfirm --needed lua52-cjson-*.pkg.tar* && \
|
||||||
cd /build/scansion-hg && su -m -s /bin/bash nobody makepkg
|
cd /build/scansion-hg && su -m -s /bin/bash nobody makepkg
|
||||||
|
|
||||||
|
RUN pacman -S --noconfirm --disable-download-timeout --needed unbound gcc luarocks && luarocks --lua-version 5.2 install luaunbound && cp /usr/lib/lua/5.2/lunbound.so /build/
|
||||||
|
|
||||||
COPY ./Cargo.* /build/
|
COPY ./Cargo.* /build/
|
||||||
COPY ./src/ /build/src/
|
COPY ./src/ /build/src/
|
||||||
#COPY ./target/ /build/target/
|
#COPY ./target/ /build/target/
|
||||||
@ -35,7 +37,7 @@ FROM base
|
|||||||
|
|
||||||
COPY --from=build /build/*/*.pkg.tar* /tmp/
|
COPY --from=build /build/*/*.pkg.tar* /tmp/
|
||||||
|
|
||||||
RUN pacman -S --noconfirm --disable-download-timeout --needed bind nginx prosody lua52-sec ejabberd nss mkcert curl && \
|
RUN pacman -S --noconfirm --disable-download-timeout --needed bind nginx prosody lua52-sec ejabberd nss mkcert curl unbound && \
|
||||||
pacman -U --noconfirm --needed /tmp/*.pkg.tar* && rm -f /tmp/*.pkg.tar* && \
|
pacman -U --noconfirm --needed /tmp/*.pkg.tar* && rm -f /tmp/*.pkg.tar* && \
|
||||||
mkdir -p /opt/xmpp-proxy/prosody-modules/ /opt/prosody-modules/ /scansion && mkcert -install && \
|
mkdir -p /opt/xmpp-proxy/prosody-modules/ /opt/prosody-modules/ /scansion && mkcert -install && \
|
||||||
mkdir -p /etc/certs/ecdsa && cd /etc/certs/ecdsa && \
|
mkdir -p /etc/certs/ecdsa && cd /etc/certs/ecdsa && \
|
||||||
@ -60,13 +62,15 @@ COPY --from=build /build/prosody-modules /opt/prosody-modules
|
|||||||
|
|
||||||
COPY --from=build /usr/bin/true /build/target/release/xmpp-prox[y] /usr/bin/
|
COPY --from=build /usr/bin/true /build/target/release/xmpp-prox[y] /usr/bin/
|
||||||
|
|
||||||
|
COPY --from=build /build/lunbound.so /usr/lib/lua/5.2/lunbound.so
|
||||||
|
|
||||||
COPY ./integration/named.conf /etc/
|
COPY ./integration/named.conf /etc/
|
||||||
COPY ./integration/00-no-tls/example.org.zone /var/named/
|
COPY ./integration/00-no-tls/example.org.zone /var/named/
|
||||||
COPY ./integration/00-no-tls/prosody1.cfg.lua /etc/prosody/prosody.cfg.lua
|
COPY ./integration/00-no-tls/prosody1.cfg.lua /etc/prosody/prosody.cfg.lua
|
||||||
COPY ./contrib/prosody-modules /opt/xmpp-proxy/prosody-modules
|
COPY ./contrib/prosody-modules /opt/xmpp-proxy/prosody-modules
|
||||||
COPY ./integration/*.scs /scansion/
|
COPY ./integration/*.scs /scansion/
|
||||||
|
|
||||||
RUN mkdir /run/prosody/
|
RUN mkdir -p /run/prosody/
|
||||||
|
|
||||||
ARG ECDSA=0
|
ARG ECDSA=0
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user