Commit 95d68a91 authored by Tomas Krizek's avatar Tomas Krizek

Merge branch 'fix-docker-build' into 'master'

docker: fix knot-resolver build

See merge request !46
parents c9a731ca a7017c1f
Pipeline #43982 passed with stage
in 1 minute and 6 seconds
......@@ -17,12 +17,13 @@ RUN ssh-keyscan gitlab.labs.nic.cz >> /root/.ssh/known_hosts
RUN git clone --recursive -j8 https://gitlab.labs.nic.cz/knot/knot-resolver.git /var/opt/knot-resolver
RUN \
cd /var/opt/knot-resolver; \
git checkout "${GIT_SHA}" -- || (\
(git checkout "${GIT_SHA}" -- && git submodule update) || (\
cd /var/opt; \
rm -rf /var/opt/knot-resolver; \
git clone --recursive -j8 git@gitlab.labs.nic.cz:knot/knot-resolver-security.git /var/opt/knot-resolver; \
cd /var/opt/knot-resolver; \
git checkout "${GIT_SHA}" --)
git checkout "${GIT_SHA}" --; \
git submodule update)
# actual image
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment