2
0
mirror of https://github.com/spritsail/plex-media-server.git synced 2024-12-20 11:34:36 +00:00

Merge branch 'master' into nofonts

This commit is contained in:
Joe Groocock 2018-08-24 11:57:46 +01:00
commit e6f4ee1f03
Signed by: frebib
GPG Key ID: E0B16BEACFBB6A86
2 changed files with 7 additions and 6 deletions

View File

@ -5,11 +5,12 @@ pipeline:
repo: plex-dev repo: plex-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: plex-dev
- docker run --rm plex-dev curl --version run: |
- docker run --rm plex-dev xmlstarlet --version curl --version &&
xmlstarlet --version
test: test:
image: spritsail/docker-test image: spritsail/docker-test

View File

@ -1,5 +1,5 @@
ARG PLEX_VER=1.13.5.5291-6fa5e50a8 ARG PLEX_VER=1.13.5.5332-21ab172de
ARG PLEX_SHA=0cb4cb011583edb0b26898d2e62253c55fc88bc7 ARG PLEX_SHA=f7dbd4319cbdc59381774428807f2cd6d86248d0
ARG LIBSTDCPP_VER=6.3.0-18+deb9u1 ARG LIBSTDCPP_VER=6.3.0-18+deb9u1
ARG LIBGCC1_VER=6.3.0-18+deb9u1 ARG LIBGCC1_VER=6.3.0-18+deb9u1
ARG XMLSTAR_VER=1.6.1 ARG XMLSTAR_VER=1.6.1