diff --git a/Dockerfile b/Dockerfile index 79f56e1..178e2a6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,23 +2,28 @@ ARG DOCKER_VERSION=19.03.8 FROM docker:${DOCKER_VERSION} AS docker-cli -FROM lsiobase/ubuntu:bionic AS build +FROM lsiobase/alpine:3.12 AS build ARG COMPOSE_VERSION -RUN apt-get update && apt-get install --no-install-recommends -y \ +RUN \ + apk add --no-cache \ + bash \ + build-base \ + ca-certificates \ curl \ gcc \ git \ libc-dev \ libffi-dev \ - libgcc-6-dev \ - libssl-dev \ + libgcc \ make \ + musl-dev \ openssl \ + openssl-dev \ python3-dev \ - python3-pip \ - zlib1g-dev + py3-pip \ + zlib-dev COPY --from=docker-cli /usr/local/bin/docker /usr/local/bin/docker @@ -26,8 +31,9 @@ RUN \ mkdir -p /compose && \ if [ -z ${COMPOSE_VERSION+x} ]; then \ COMPOSE_VERSION=$(curl -sX GET "https://api.github.com/repos/docker/compose/releases/latest" \ - | awk '/tag_name/{print $4;exit}' FS='[""]'); \ + | awk '/tag_name/{print $4;exit}' FS='[""]' | awk '$0="alpine-"$0'); \ fi && \ + COMPOSE_VERSION=$(echo "$COMPOSE_VERSION" | sed 's|alpine-||') && \ git clone https://github.com/docker/compose.git && \ cd /compose && \ git checkout "${COMPOSE_VERSION}" && \ @@ -40,6 +46,13 @@ RUN \ chmod 777 dist && \ /compose/.tox/${PY_ARG}/bin/pip3 install -q -r requirements-build.txt && \ echo "$(script/build/write-git-sha)" > compose/GITSHA && \ + PYINSTVER=$(cat requirements-build.txt | grep pyinstaller | sed 's|pyinstaller==|v|') && \ + git clone --single-branch --branch develop https://github.com/pyinstaller/pyinstaller.git /tmp/pyinstaller && \ + cd /tmp/pyinstaller/bootloader && \ + git checkout $(PYINSTVER) && \ + /compose/.tox/${PY_ARG}/bin/python3 ./waf configure --no-lsb all && \ + /compose/.tox/${PY_ARG}/bin/pip3 install .. && \ + cd /compose && \ export PATH="/compose/pyinstaller:${PATH}" && \ /compose/.tox/${PY_ARG}/bin/pyinstaller --exclude-module pycrypto --exclude-module PyInstaller docker-compose.spec && \ ls -la dist/ && \ @@ -48,7 +61,7 @@ RUN \ docker-compose version ############## runtime stage ############## -FROM lsiobase/ubuntu:bionic +FROM lsiobase/alpine:3.12 ARG BUILD_DATE ARG VERSION diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index ba5f7da..5b5150a 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,24 +1,29 @@ ARG DOCKER_VERSION=19.03.8 -FROM arm64v8/docker:${DOCKER_VERSION} AS docker-cli +FROM docker:${DOCKER_VERSION} AS docker-cli -FROM lsiobase/ubuntu:arm64v8-bionic AS build +FROM lsiobase/alpine:arm64v8-3.12 AS build ARG COMPOSE_VERSION -RUN apt-get update && apt-get install --no-install-recommends -y \ +RUN \ + apk add --no-cache \ + bash \ + build-base \ + ca-certificates \ curl \ gcc \ git \ libc-dev \ libffi-dev \ - libgcc-6-dev \ - libssl-dev \ + libgcc \ make \ + musl-dev \ openssl \ + openssl-dev \ python3-dev \ - python3-pip \ - zlib1g-dev + py3-pip \ + zlib-dev COPY --from=docker-cli /usr/local/bin/docker /usr/local/bin/docker @@ -26,8 +31,9 @@ RUN \ mkdir -p /compose && \ if [ -z ${COMPOSE_VERSION+x} ]; then \ COMPOSE_VERSION=$(curl -sX GET "https://api.github.com/repos/docker/compose/releases/latest" \ - | awk '/tag_name/{print $4;exit}' FS='[""]'); \ + | awk '/tag_name/{print $4;exit}' FS='[""]' | awk '$0="alpine-"$0'); \ fi && \ + COMPOSE_VERSION=$(echo "$COMPOSE_VERSION" | sed 's|alpine-||') && \ git clone https://github.com/docker/compose.git && \ cd /compose && \ git checkout "${COMPOSE_VERSION}" && \ @@ -40,6 +46,13 @@ RUN \ chmod 777 dist && \ /compose/.tox/${PY_ARG}/bin/pip3 install -q -r requirements-build.txt && \ echo "$(script/build/write-git-sha)" > compose/GITSHA && \ + PYINSTVER=$(cat requirements-build.txt | grep pyinstaller | sed 's|pyinstaller==|v|') && \ + git clone --single-branch --branch develop https://github.com/pyinstaller/pyinstaller.git /tmp/pyinstaller && \ + cd /tmp/pyinstaller/bootloader && \ + git checkout $(PYINSTVER) && \ + /compose/.tox/${PY_ARG}/bin/python3 ./waf configure --no-lsb all && \ + /compose/.tox/${PY_ARG}/bin/pip3 install .. && \ + cd /compose && \ export PATH="/compose/pyinstaller:${PATH}" && \ /compose/.tox/${PY_ARG}/bin/pyinstaller --exclude-module pycrypto --exclude-module PyInstaller docker-compose.spec && \ ls -la dist/ && \ @@ -48,7 +61,7 @@ RUN \ docker-compose version ############## runtime stage ############## -FROM lsiobase/ubuntu:arm64v8-bionic +FROM lsiobase/alpine:arm64v8-3.12 ARG BUILD_DATE ARG VERSION diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 87d611e..4950400 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,24 +1,29 @@ ARG DOCKER_VERSION=19.03.8 -FROM arm32v7/docker:${DOCKER_VERSION} AS docker-cli +FROM docker:${DOCKER_VERSION} AS docker-cli -FROM lsiobase/ubuntu:arm32v7-bionic AS build +FROM lsiobase/alpine:arm32v7-3.12 AS build ARG COMPOSE_VERSION -RUN apt-get update && apt-get install --no-install-recommends -y \ +RUN \ + apk add --no-cache \ + bash \ + build-base \ + ca-certificates \ curl \ gcc \ git \ libc-dev \ libffi-dev \ - libgcc-6-dev \ - libssl-dev \ + libgcc \ make \ + musl-dev \ openssl \ + openssl-dev \ python3-dev \ - python3-pip \ - zlib1g-dev + py3-pip \ + zlib-dev COPY --from=docker-cli /usr/local/bin/docker /usr/local/bin/docker @@ -26,8 +31,9 @@ RUN \ mkdir -p /compose && \ if [ -z ${COMPOSE_VERSION+x} ]; then \ COMPOSE_VERSION=$(curl -sX GET "https://api.github.com/repos/docker/compose/releases/latest" \ - | awk '/tag_name/{print $4;exit}' FS='[""]'); \ + | awk '/tag_name/{print $4;exit}' FS='[""]' | awk '$0="alpine-"$0'); \ fi && \ + COMPOSE_VERSION=$(echo "$COMPOSE_VERSION" | sed 's|alpine-||') && \ git clone https://github.com/docker/compose.git && \ cd /compose && \ git checkout "${COMPOSE_VERSION}" && \ @@ -40,6 +46,13 @@ RUN \ chmod 777 dist && \ /compose/.tox/${PY_ARG}/bin/pip3 install -q -r requirements-build.txt && \ echo "$(script/build/write-git-sha)" > compose/GITSHA && \ + PYINSTVER=$(cat requirements-build.txt | grep pyinstaller | sed 's|pyinstaller==|v|') && \ + git clone --single-branch --branch develop https://github.com/pyinstaller/pyinstaller.git /tmp/pyinstaller && \ + cd /tmp/pyinstaller/bootloader && \ + git checkout $(PYINSTVER) && \ + /compose/.tox/${PY_ARG}/bin/python3 ./waf configure --no-lsb all && \ + /compose/.tox/${PY_ARG}/bin/pip3 install .. && \ + cd /compose && \ export PATH="/compose/pyinstaller:${PATH}" && \ /compose/.tox/${PY_ARG}/bin/pyinstaller --exclude-module pycrypto --exclude-module PyInstaller docker-compose.spec && \ ls -la dist/ && \ @@ -48,7 +61,7 @@ RUN \ docker-compose version ############## runtime stage ############## -FROM lsiobase/ubuntu:arm32v7-bionic +FROM lsiobase/alpine:arm32v7-3.12 ARG BUILD_DATE ARG VERSION diff --git a/Jenkinsfile b/Jenkinsfile index b5ece9c..383dcdf 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,16 +16,14 @@ pipeline { GITHUB_TOKEN=credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab') GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0') GITLAB_NAMESPACE=credentials('gitlab-namespace-id') - EXT_GIT_BRANCH = 'master' - EXT_USER = 'docker' - EXT_REPO = 'compose' BUILD_VERSION_ARG = 'COMPOSE_VERSION' LS_USER = 'linuxserver' LS_REPO = 'docker-docker-compose' + CONTAINER_NAME = 'docker-compose' DOCKERHUB_IMAGE = 'linuxserver/docker-compose' DEV_DOCKERHUB_IMAGE = 'lsiodev/docker-compose' PR_DOCKERHUB_IMAGE = 'lspipepr/docker-compose' - DIST_IMAGE = 'ubuntu' + DIST_IMAGE = 'alpine' MULTIARCH='true' CI='false' CI_WEB='false' @@ -43,7 +41,7 @@ pipeline { script{ env.EXIT_STATUS = '' env.LS_RELEASE = sh( - script: '''docker run --rm alexeiled/skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':latest 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''', + script: '''docker run --rm alexeiled/skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':alpine 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''', returnStdout: true).trim() env.LS_RELEASE_NOTES = sh( script: '''cat readme-vars.yml | awk -F \\" '/date: "[0-9][0-9].[0-9][0-9].[0-9][0-9]:/ {print $4;exit;}' | sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''', @@ -100,23 +98,16 @@ pipeline { /* ######################## External Release Tagging ######################## */ - // If this is a stable github release use the latest endpoint from github to determine the ext tag - stage("Set ENV github_stable"){ - steps{ - script{ - env.EXT_RELEASE = sh( - script: '''curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases/latest | jq -r '. | .tag_name' ''', - returnStdout: true).trim() - } - } - } - // If this is a stable or devel github release generate the link for the build message - stage("Set ENV github_link"){ - steps{ - script{ - env.RELEASE_LINK = 'https://github.com/' + env.EXT_USER + '/' + env.EXT_REPO + '/releases/tag/' + env.EXT_RELEASE - } - } + // If this is a custom command to determine version use that command + stage("Set tag custom bash"){ + steps{ + script{ + env.EXT_RELEASE = sh( + script: ''' curl -sX GET "https://api.github.com/repos/docker/compose/releases/latest" | awk '/tag_name/{print $4;exit}' FS='[""]' | awk '$0="alpine-"$0' ''', + returnStdout: true).trim() + env.RELEASE_LINK = 'custom_command' + } + } } // Sanitize the release tag and strip illegal docker or github characters stage("Sanitize tag"){ @@ -128,10 +119,10 @@ pipeline { } } } - // If this is a master build use live docker endpoints + // If this is a alpine build use live docker endpoints stage("Set ENV live build"){ when { - branch "master" + branch "alpine" environment name: 'CHANGE_ID', value: '' } steps { @@ -151,7 +142,7 @@ pipeline { // If this is a dev build use dev docker endpoints stage("Set ENV dev build"){ when { - not {branch "master"} + not {branch "alpine"} environment name: 'CHANGE_ID', value: '' } steps { @@ -222,7 +213,7 @@ pipeline { // Use helper containers to render templated files stage('Update-Templates') { when { - branch "master" + branch "alpine" environment name: 'CHANGE_ID', value: '' expression { env.CONTAINER_NAME != null @@ -233,7 +224,7 @@ pipeline { set -e TEMPDIR=$(mktemp -d) docker pull linuxserver/jenkins-builder:latest - docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest + docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=alpine -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) cd ${TEMPDIR}/docker-${CONTAINER_NAME} NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) @@ -241,7 +232,7 @@ pipeline { mkdir -p ${TEMPDIR}/repo git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} cd ${TEMPDIR}/repo/${LS_REPO} - git checkout -f master + git checkout -f alpine cd ${TEMPDIR}/docker-${CONTAINER_NAME} mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ @@ -273,7 +264,7 @@ pipeline { // Exit the build if the Templated files were just updated stage('Template-exit') { when { - branch "master" + branch "alpine" environment name: 'CHANGE_ID', value: '' environment name: 'FILES_UPDATED', value: 'true' expression { @@ -396,7 +387,7 @@ pipeline { // Take the image we just built and dump package versions for comparison stage('Update-packages') { when { - branch "master" + branch "alpine" environment name: 'CHANGE_ID', value: '' environment name: 'EXIT_STATUS', value: '' } @@ -424,7 +415,7 @@ pipeline { echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github" if [ "${NEW_PACKAGE_TAG}" != "${PACKAGE_TAG}" ]; then git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/${LS_REPO} - git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f master + git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f alpine cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/ cd ${TEMPDIR}/${LS_REPO}/ wait @@ -448,7 +439,7 @@ pipeline { // Exit the build if the package file was just updated stage('PACKAGE-exit') { when { - branch "master" + branch "alpine" environment name: 'CHANGE_ID', value: '' environment name: 'PACKAGE_UPDATED', value: 'true' environment name: 'EXIT_STATUS', value: '' @@ -462,7 +453,7 @@ pipeline { // Exit the build if this is just a package check and there are no changes to push stage('PACKAGECHECK-exit') { when { - branch "master" + branch "alpine" environment name: 'CHANGE_ID', value: '' environment name: 'PACKAGE_UPDATED', value: 'false' environment name: 'EXIT_STATUS', value: '' @@ -551,8 +542,8 @@ pipeline { echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG} - docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest - docker push ${PUSHIMAGE}:latest + docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:alpine + docker push ${PUSHIMAGE}:alpine docker push ${PUSHIMAGE}:${META_TAG} done ''' @@ -561,7 +552,7 @@ pipeline { for DELETEIMAGE in "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do docker rmi \ ${DELETEIMAGE}:${META_TAG} \ - ${DELETEIMAGE}:latest || : + ${DELETEIMAGE}:alpine || : done ''' } @@ -598,51 +589,51 @@ pipeline { docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} - docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-latest - docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-latest - docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest + docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-alpine + docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-alpine + docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-alpine docker push ${MANIFESTIMAGE}:amd64-${META_TAG} docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG} docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG} - docker push ${MANIFESTIMAGE}:amd64-latest - docker push ${MANIFESTIMAGE}:arm32v7-latest - docker push ${MANIFESTIMAGE}:arm64v8-latest - docker manifest push --purge ${MANIFESTIMAGE}:latest || : - docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest - docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --os linux --arch arm - docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8 + docker push ${MANIFESTIMAGE}:amd64-alpine + docker push ${MANIFESTIMAGE}:arm32v7-alpine + docker push ${MANIFESTIMAGE}:arm64v8-alpine + docker manifest push --purge ${MANIFESTIMAGE}:alpine || : + docker manifest create ${MANIFESTIMAGE}:alpine ${MANIFESTIMAGE}:amd64-alpine ${MANIFESTIMAGE}:arm32v7-alpine ${MANIFESTIMAGE}:arm64v8-alpine + docker manifest annotate ${MANIFESTIMAGE}:alpine ${MANIFESTIMAGE}:arm32v7-alpine --os linux --arch arm + docker manifest annotate ${MANIFESTIMAGE}:alpine ${MANIFESTIMAGE}:arm64v8-alpine --os linux --arch arm64 --variant v8 docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || : docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8 - docker manifest push --purge ${MANIFESTIMAGE}:latest + docker manifest push --purge ${MANIFESTIMAGE}:alpine docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} done docker tag ${IMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:amd64-${META_TAG} docker tag ${IMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-${META_TAG} docker tag ${IMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-${META_TAG} - docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:latest + docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:alpine docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:${META_TAG} - docker tag ${GITHUBIMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-latest - docker tag ${GITHUBIMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-latest + docker tag ${GITHUBIMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-alpine + docker tag ${GITHUBIMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-alpine docker push ${GITHUBIMAGE}:amd64-${META_TAG} docker push ${GITHUBIMAGE}:arm32v7-${META_TAG} docker push ${GITHUBIMAGE}:arm64v8-${META_TAG} - docker push ${GITHUBIMAGE}:latest + docker push ${GITHUBIMAGE}:alpine docker push ${GITHUBIMAGE}:${META_TAG} - docker push ${GITHUBIMAGE}:arm32v7-latest - docker push ${GITHUBIMAGE}:arm64v8-latest + docker push ${GITHUBIMAGE}:arm32v7-alpine + docker push ${GITHUBIMAGE}:arm64v8-alpine ''' } sh '''#! /bin/bash for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do docker rmi \ ${DELETEIMAGE}:amd64-${META_TAG} \ - ${DELETEIMAGE}:amd64-latest \ + ${DELETEIMAGE}:amd64-alpine \ ${DELETEIMAGE}:arm32v7-${META_TAG} \ - ${DELETEIMAGE}:arm32v7-latest \ + ${DELETEIMAGE}:arm32v7-alpine \ ${DELETEIMAGE}:arm64v8-${META_TAG} \ - ${DELETEIMAGE}:arm64v8-latest || : + ${DELETEIMAGE}:arm64v8-alpine || : done docker rmi \ lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \ @@ -654,7 +645,7 @@ pipeline { // If this is a public release tag it in the LS Github stage('Github-Tag-Push-Release') { when { - branch "master" + branch "alpine" expression { env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER } @@ -666,17 +657,17 @@ pipeline { sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \ -d '{"tag":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\ "object": "'${COMMIT_SHA}'",\ - "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to master",\ + "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to alpine",\ "type": "commit",\ "tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' ''' echo "Pushing New release for Tag" sh '''#! /bin/bash - curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases/latest | jq '. |.body' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json + echo "Updating to ${EXT_RELEASE_CLEAN}" > releasebody.json echo '{"tag_name":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\ - "target_commitish": "master",\ + "target_commitish": "alpine",\ "name": "'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\ - "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n**'${EXT_REPO}' Changes:**\\n\\n' > start - printf '","draft": false,"prerelease": false}' >> releasebody.json + "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n**Remote Changes:**\\n\\n' > start + printf '","draft": false,"prerelease": true}' >> releasebody.json paste -d'\\0' start releasebody.json > releasebody.json.done curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done''' } diff --git a/README.md b/README.md index ae1213d..3c40c75 100644 --- a/README.md +++ b/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,14 @@ 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. `latest` tag usually provides the latest stable version. Others are considered under development and caution must be exercised when using them. + +| Tag | Description | +| :----: | --- | +| latest | Ubuntu based images | +| alpine | Alpine based images | ## Usage @@ -117,5 +124,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. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index a8ba91d..44daddb 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -2,21 +2,20 @@ # jenkins variables project_name: docker-docker-compose -external_type: github_stable -release_type: stable -release_tag: latest -ls_branch: master +external_type: na +custom_version_command: "curl -sX GET \"https://api.github.com/repos/docker/compose/releases/latest\" | awk '/tag_name/{print $4;exit}' FS='[\"\"]' | awk '$0=\"alpine-\"$0'" +release_type: prerelease +release_tag: alpine +ls_branch: alpine repo_vars: - - EXT_GIT_BRANCH = 'master' - - EXT_USER = 'docker' - - EXT_REPO = 'compose' - BUILD_VERSION_ARG = 'COMPOSE_VERSION' - LS_USER = 'linuxserver' - LS_REPO = 'docker-docker-compose' + - CONTAINER_NAME = 'docker-compose' - DOCKERHUB_IMAGE = 'linuxserver/docker-compose' - DEV_DOCKERHUB_IMAGE = 'lsiodev/docker-compose' - PR_DOCKERHUB_IMAGE = 'lspipepr/docker-compose' - - DIST_IMAGE = 'ubuntu' + - DIST_IMAGE = 'alpine' - MULTIARCH='true' - CI='false' - CI_WEB='false' diff --git a/readme-vars.yml b/readme-vars.yml index 15e6cab..3050985 100644 --- a/readme-vars.yml +++ b/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,14 @@ full_custom_readme: | | arm64 | arm64v8-latest | | armhf | arm32v7-latest | + ## Version Tags + + This image provides various versions that are available via tags. `latest` tag usually provides the latest stable version. Others are considered under development and caution must be exercised when using them. + + | Tag | Description | + | :----: | --- | + | latest | Ubuntu based images | + | alpine | Alpine based images | ## Usage @@ -123,6 +130,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. diff --git a/run.sh b/run.sh index 1497ed6..8f0bc95 100644 --- a/run.sh +++ b/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 "$@" \ No newline at end of file