pimhwang
/
qTox
mirror of https://github.com/qTox/qTox.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #6308 

Jamie Westell (1):
      chore(docker): add missing deps to dockerfiles
reviewable/pr6309/r1
Anthony Bilinski 5 years ago
parent
8a8f9dd654 4fa203e6d5
commit
cfe6250d9d
No known key found for this signature in database
GPG Key ID: 2AA8E0DA1B31FB3C
2 changed files with 28 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      docker/Dockerfile.debian
  2. 14
      docker/Dockerfile.ubuntu

14
docker/Dockerfile.debian
Unescape View File

@ -57,6 +57,20 @@ RUN git checkout v0.2.12 && \ @@ -57,6 +57,20 @@ RUN git checkout v0.2.12 && \
echo '/usr/local/lib/' >> /etc/ld.so.conf.d/locallib.conf && \
ldconfig
RUN git clone https://github.com/toxext/toxext.git /toxext
WORKDIR /toxext
RUN git checkout v0.0.2 && \
cmake . && \
cmake --build . -- -j $(nproc) && \
cmake --build . --target install
RUN git clone https://github.com/toxext/tox_extension_messages.git /tox_extension_messages
WORKDIR /tox_extension_messages
RUN git checkout v0.0.2 && \
cmake . && \
cmake --build . -- -j $(nproc) && \
cmake --build . --target install
COPY . /qtox
WORKDIR /qtox
RUN cmake . && cmake --build .

14
docker/Dockerfile.ubuntu
Unescape View File

@ -54,6 +54,20 @@ RUN git checkout v0.2.12 && \ @@ -54,6 +54,20 @@ RUN git checkout v0.2.12 && \
echo '/usr/local/lib/' >> /etc/ld.so.conf.d/locallib.conf && \
ldconfig
RUN git clone https://github.com/toxext/toxext.git /toxext
WORKDIR /toxext
RUN git checkout v0.0.2 && \
cmake . && \
cmake --build . -- -j $(nproc) && \
cmake --build . --target install
RUN git clone https://github.com/toxext/tox_extension_messages.git /tox_extension_messages
WORKDIR /tox_extension_messages
RUN git checkout v0.0.2 && \
cmake . && \
cmake --build . -- -j $(nproc) && \
cmake --build . --target install
COPY . /qtox
WORKDIR /qtox
RUN cmake . && cmake --build .

Write Preview
Loading…
Cancel
Save