update of README with badges for new ci

Merge pull request #6 from linuxserver/alpine_3.6
bump to alpine 3.6
2017-07-12 06:47:09 +01:00 · 2017-05-28 21:57:29 +02:00 · 2017-05-28 19:17:20 +01:00
2 changed files with 13 additions and 11 deletions
--- a/21
+++ b/21
@ -1,4 +1,4 @@
-FROM lsiobase/alpine:3.5
+FROM lsiobase/alpine:3.6
 MAINTAINER saarg

 # set version label
@ -6,16 +6,8 @@ ARG BUILD_DATE
 ARG VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"

-# install runtime packages
-RUN \
- apk add --no-cache \
-	libcrypto1.0 \
-	libssl1.0 \
-	libusb \
-	pcsc-lite \
-	pcsc-lite-libs && \
-
 # install build packages
+RUN \
 apk add --no-cache --virtual=build-dependencies \
 	curl \
 	gcc \
@ -28,6 +20,15 @@ RUN \
 	subversion \
 	tar && \

+# install runtime packages
+ apk add --no-cache \
+	libcrypto1.0 \
+	libssl1.0 \
+	libusb \
+	pcsc-lite \
+	pcsc-lite-libs && \
+
+
 # compile oscam from source
 svn checkout http://www.streamboard.tv/svn/oscam/trunk /tmp/oscam-svn && \
 cd /tmp/oscam-svn && \
--- a/README.md
+++ b/README.md
@ -13,7 +13,7 @@ The [LinuxServer.io][linuxserverurl] team brings you another container release f
 * [Podcast][podcasturl] covers everything to do with getting the most from your Linux Server plus a focus on all things Docker and containerisation!

 # linuxserver/oscam
-[![](https://images.microbadger.com/badges/version/linuxserver/oscam.svg)](https://microbadger.com/images/linuxserver/oscam "Get your own version badge on microbadger.com")[![](https://images.microbadger.com/badges/image/linuxserver/oscam.svg)](https://microbadger.com/images/linuxserver/oscam "Get your own image badge on microbadger.com")[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/oscam.svg)][hub][![Docker Stars](https://img.shields.io/docker/stars/linuxserver/oscam.svg)][hub][![Build Status](http://jenkins.linuxserver.io:8080/buildStatus/icon?job=Dockers/LinuxServer.io/linuxserver-oscam)](http://jenkins.linuxserver.io:8080/job/Dockers/job/LinuxServer.io/job/linuxserver-oscam/)
+[![](https://images.microbadger.com/badges/version/linuxserver/oscam.svg)](https://microbadger.com/images/linuxserver/oscam "Get your own version badge on microbadger.com")[![](https://images.microbadger.com/badges/image/linuxserver/oscam.svg)](https://microbadger.com/images/linuxserver/oscam "Get your own image badge on microbadger.com")[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/oscam.svg)][hub][![Docker Stars](https://img.shields.io/docker/stars/linuxserver/oscam.svg)][hub][![Build Status](https://ci.linuxserver.io/buildStatus/icon?job=Docker-Builders/x86-64/x86-64-oscam)](https://ci.linuxserver.io/job/Docker-Builders/job/x86-64/job/x86-64-oscam/)

 [Oscam][appurl] is an Open Source Conditional Access Module software used for descrambling DVB transmissions using smart cards. It's both a server and a client.

@ -100,6 +100,7 @@ The web interface is at port 8888.

 ## Versions

+ **28.05.2017:** Rebase to alpine 3.6.
 + **09.02.2017:** Rebase to alpine 3.5.
 + **14.10.2016:** Add version layer information.
 + **02.10.2016:** Add info on passing through devices to README.
Author	SHA1	Message	Date
sparklyballs	bae428a8a3	update of README with badges for new ci	2017-07-12 06:47:09 +01:00
saarg	0e91e3adee	Merge pull request #6 from linuxserver/alpine_3.6 bump to alpine 3.6	2017-05-28 21:57:29 +02:00
sparklyballs	d317624ea5	bump to alpine 3.6	2017-05-28 19:17:20 +01:00