Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use correct path for hifi.conf; copy DS resources to image

Browse source
This commit is contained in:
Simon Walton 2019-11-27 15:19:22 -08:00
parent 99eadd1cdd
commit c88479610d
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/cmake.yml vendored
View file

@ -224,7 +224,7 @@ jobs:
shell: bash
working-directory: ${{runner.workspace}}/build
run: |
cp ../tools/ci-scripts/linux-gha/hifi.conf .
cp $GITHUB_WORKSPACE/tools/ci-scripts/linux-gha/hifi.conf .
docker build -t $DOCKER_IMAGE_NAME -f $GITHUB_WORKSPACE/tools/ci-scripts/linux-gha/Dockerfile ./
- name: Export Docker image
shell: bash

2
tools/ci-scripts/linux-gha/Dockerfile
View file

@ -16,7 +16,7 @@ COPY ./plugins/pcmCodec/libpcmCodec.so /etc/hifi/server/plugins/
RUN true
COPY ./*.so /lib/
RUN ln -sf /lib/libquazip5.so /lib/libquazip5.so.1
#COPY ./resources/ /etc/hifi/server/resources/
COPY ./domain-server/resources/ /etc/hifi/server/resources/
COPY ./hifi.conf /etc/supervisor/conf.d/hifi.conf
RUN for fn in /usr/local/Qt5.12.3/5.12.3/gcc_64/plugins/imageformats/*.so; do \
if [ ! -x $fn ]; then ln -s $fn /etc/hifi/server/imageformats; fi; done