Merge pull request #5 from linuxserver/readme

Readme and script updates

Author: aptalca

Jenkinsfile

@@ -19,6 +19,7 @@ pipeline {
     EXT_GIT_BRANCH = 'master'
     EXT_USER = 'docker'
     EXT_REPO = 'compose'
+    CONTAINER_NAME = 'docker-compose'
     BUILD_VERSION_ARG = 'COMPOSE_VERSION'
     LS_USER = 'linuxserver'
     LS_REPO = 'docker-docker-compose'

README.md

@@ -33,7 +33,6 @@ Find us at:
 [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/docker-compose.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/docker-compose)
 [![Docker Stars](https://img.shields.io/docker/stars/linuxserver/docker-compose.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/docker-compose)
 [![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-docker-compose%2Fjob%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-docker-compose/job/master/)
-[![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Flsio-ci.ams3.digitaloceanspaces.com%2Flinuxserver%2Fdocker-compose%2Flatest%2Fci-status.yml)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/docker-compose/latest/index.html)
 
 [Docker-compose](https://github.com/docker/compose) is a tool for defining and running multi-container Docker applications. With Compose, you use a Compose file to configure your application's services. Then, using a single command, you create and start all the services from your configuration.
 
@@ -53,6 +52,12 @@ The architectures supported by this image are:
 | arm64 | arm64v8-latest |
 | armhf | arm32v7-latest |
 
+## Version Tags
+This image provides various versions that are available via tags.
+| Tag | Description |
+| :----: | --- |
+| latest | Ubuntu based images |
+| alpine | Alpine based images |
 
 ## Usage
 
@@ -117,5 +122,6 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **01.07.20:** - Release alpine based images at `alpine` tag.
 * **04.06.20:** - Bump docker-cli to 19.03.8, auto-detect python3 version.
 * **19.05.20:** - Initial Release.

jenkins-vars.yml

@@ -10,6 +10,7 @@ repo_vars:
   - EXT_GIT_BRANCH = 'master'
   - EXT_USER = 'docker'
   - EXT_REPO = 'compose'
+  - CONTAINER_NAME = 'docker-compose'
   - BUILD_VERSION_ARG = 'COMPOSE_VERSION'
   - LS_USER = 'linuxserver'
   - LS_REPO = 'docker-docker-compose'

readme-vars.yml

@@ -39,7 +39,6 @@ full_custom_readme: |
   [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/docker-compose.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/docker-compose)
   [![Docker Stars](https://img.shields.io/docker/stars/linuxserver/docker-compose.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/docker-compose)
   [![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-docker-compose%2Fjob%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-docker-compose/job/master/)
-  [![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Flsio-ci.ams3.digitaloceanspaces.com%2Flinuxserver%2Fdocker-compose%2Flatest%2Fci-status.yml)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/docker-compose/latest/index.html)
 
   [Docker-compose](https://github.com/docker/compose) is a tool for defining and running multi-container Docker applications. With Compose, you use a Compose file to configure your application's services. Then, using a single command, you create and start all the services from your configuration.
 
@@ -59,6 +58,12 @@ full_custom_readme: |
   | arm64 | arm64v8-latest |
   | armhf | arm32v7-latest |
 
+  ## Version Tags
+  This image provides various versions that are available via tags.
+  | Tag | Description |
+  | :----: | --- |
+  | latest | Ubuntu based images |
+  | alpine | Alpine based images |
 
   ## Usage
 
@@ -123,6 +128,7 @@ full_custom_readme: |
 
   ## Versions
 
+  * **01.07.20:** - Release alpine based images at `alpine` tag.
   * **04.06.20:** - Bump docker-cli to 19.03.8, auto-detect python3 version.
   * **19.05.20:** - Initial Release.
 

run.sh

@@ -17,7 +17,7 @@
 
 set -e
 
-VERSION="latest" # can be set to a specific version tag from docker hub, such as "1.25.5"
+VERSION="latest" # can be set to a specific version tag from docker hub, such as "1.25.5", or "alpine"
 IMAGE="linuxserver/docker-compose:$VERSION"
 
 
@@ -62,5 +62,10 @@ if docker info --format '{{json .SecurityOptions}}' 2>/dev/null | grep -q 'name=
     DOCKER_RUN_OPTIONS="$DOCKER_RUN_OPTIONS --userns=host"
 fi
 
+# Detect SELinux and add --privileged if necessary
+if docker info --format '{{json .SecurityOptions}}' 2>/dev/null | grep -q 'name=selinux'; then
+    DOCKER_RUN_OPTIONS="$DOCKER_RUN_OPTIONS --privileged"
+fi
+
 # shellcheck disable=SC2086
 exec docker run --rm $DOCKER_RUN_OPTIONS $DOCKER_ADDR $COMPOSE_OPTIONS $VOLUMES -w "$(pwd)" $IMAGE "$@"