Merge remote-tracking branch 'origin/master' into pass

This commit is contained in:
Joe Groocock 2018-08-24 12:00:32 +01:00
commit 100e95f6f9
Signed by: frebib
GPG Key ID: E0B16BEACFBB6A86
2 changed files with 7 additions and 4 deletions

View File

@ -5,11 +5,12 @@ pipeline:
repo: ppass-dev repo: ppass-dev
test-bin: test-bin:
image: docker image: spritsail/docker-test
volumes: [ '/var/run/docker.sock:/var/run/docker.sock' ] volumes: [ '/var/run/docker.sock:/var/run/docker.sock' ]
commands: repo: ppass-dev
- docker run --rm ppass-dev curl --version run: |
- docker run --rm ppass-dev xmlstarlet --version curl --version &&
xmlstarlet --version
test: test:
image: spritsail/docker-test image: spritsail/docker-test

View File

@ -127,11 +127,13 @@ RUN curl -fsSL http://ftp.de.debian.org/debian/pool/main/g/gcc-${LIBSTDCPP_VER:0
&& cd usr/lib/plexmediaserver \ && cd usr/lib/plexmediaserver \
&& rm -f \ && rm -f \
"Plex Media Server Tests" \ "Plex Media Server Tests" \
MigratePlexServerConfig.sh \
libcrypto.so.1.0.0 \ libcrypto.so.1.0.0 \
libcurl.so.4 \ libcurl.so.4 \
libssl.so.1.0.0 \ libssl.so.1.0.0 \
libxml2.so.2 \ libxml2.so.2 \
libxslt.so.1 \ libxslt.so.1 \
Resources/start.sh \
# Place shared libraries in usr/lib so they can be actually shared # Place shared libraries in usr/lib so they can be actually shared
&& mv *.so* ../ && mv *.so* ../