Only fetch v1 releases (#31)

Author: thespad

.github/workflows/external_trigger.yml

@@ -18,7 +18,7 @@ jobs:
           fi
           echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_DOCKER_COMPOSE_MASTER\". ****"
           echo "**** Retrieving external version ****"
-          EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/docker/compose/releases/latest" | jq -r '. | .tag_name')
+          EXT_RELEASE=$(curl -u ${{ secrets.CR_USER }}:${{ secrets.CR_PAT }} -sX GET https://api.github.com/repos/docker/compose/releases | jq -r 'first(.[] | select(.tag_name | startswith("1."))) | .tag_name')
           if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
             echo "**** Can't retrieve external version, exiting ****"
             FAILURE_REASON="Can't retrieve external version for docker-compose branch master"

Dockerfile

@@ -1,18 +1,19 @@
-ARG DOCKER_VERSION=19.03
+ARG DOCKER_VERSION=20.10.13
 
 FROM docker:${DOCKER_VERSION} AS docker-cli
 
-FROM ghcr.io/linuxserver/baseimage-ubuntu:bionic AS build
+FROM ghcr.io/linuxserver/baseimage-ubuntu:focal AS build
 
 ARG COMPOSE_VERSION
 
 RUN apt-get update && apt-get install --no-install-recommends -y \
     curl \
     gcc \
     git \
+    jq \
     libc-dev \
     libffi-dev \
-    libgcc-6-dev \
+    libgcc-10-dev \
     libssl-dev \
     make \
     openssl \
@@ -23,34 +24,34 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
 COPY --from=docker-cli /usr/local/bin/docker /usr/local/bin/docker
 
 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='[""]'); \
- fi && \
- git clone https://github.com/docker/compose.git && \
- cd /compose && \
- git checkout "${COMPOSE_VERSION}" && \
- pip3 install -U pip && \
- pip install -U --ignore-installed \
-   virtualenv \
-   tox && \
- PY_ARG=$(printf "$(python3 -V)" | awk '{print $2}' | awk 'BEGIN{FS=OFS="."} NF--' | sed 's|\.||g' | sed 's|^|py|g') && \
- sed -i "s|envlist = .*|envlist = ${PY_ARG},pre-commit|g" tox.ini && \
- tox --notest && \
- mkdir -p dist && \
- chmod 777 dist && \
- /compose/.tox/${PY_ARG}/bin/pip3 install -q -r requirements-build.txt && \
- echo "$(script/build/write-git-sha)" > compose/GITSHA && \
- export PATH="/compose/pyinstaller:${PATH}" && \
- /compose/.tox/${PY_ARG}/bin/pyinstaller --exclude-module pycrypto --exclude-module PyInstaller docker-compose.spec && \
- ls -la dist/ && \
- ldd dist/docker-compose && \
- mv dist/docker-compose /usr/local/bin && \
- docker-compose version
+  mkdir -p /compose && \
+  if [ -z ${COMPOSE_VERSION+x} ]; then \
+    COMPOSE_VERSION=$(curl -sX GET "https://api.github.com/repos/docker/compose/releases" \
+    | jq -r 'first(.[] | select(.tag_name | startswith("1."))) | .tag_name'); \
+  fi && \
+  git clone https://github.com/docker/compose.git && \
+  cd /compose && \
+  git checkout "${COMPOSE_VERSION}" && \
+  pip3 install -U pip && \
+  pip install -U --ignore-installed \
+    virtualenv \
+    tox && \
+  PY_ARG=$(printf "$(python3 -V)" | awk '{print $2}' | awk 'BEGIN{FS=OFS="."} NF--' | sed 's|\.||g' | sed 's|^|py|g') && \
+  sed -i "s|envlist = .*|envlist = ${PY_ARG},pre-commit|g" tox.ini && \
+  tox --notest && \
+  mkdir -p dist && \
+  chmod 777 dist && \
+  /compose/.tox/${PY_ARG}/bin/pip3 install -q -r requirements-build.txt && \
+  echo "$(script/build/write-git-sha)" > compose/GITSHA && \
+  export PATH="/compose/pyinstaller:${PATH}" && \
+  /compose/.tox/${PY_ARG}/bin/pyinstaller --exclude-module pycrypto --exclude-module PyInstaller docker-compose.spec && \
+  ls -la dist/ && \
+  ldd dist/docker-compose && \
+  mv dist/docker-compose /usr/local/bin && \
+  docker-compose version
 
 ############## runtime stage ##############
-FROM ghcr.io/linuxserver/baseimage-ubuntu:bionic
+FROM ghcr.io/linuxserver/baseimage-ubuntu:focal
 
 ARG BUILD_DATE
 ARG VERSION

Dockerfile.aarch64

@@ -1,18 +1,19 @@
-ARG DOCKER_VERSION=19.03
+ARG DOCKER_VERSION=20.10.13
 
 FROM arm64v8/docker:${DOCKER_VERSION} AS docker-cli
 
-FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-bionic AS build
+FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-focal AS build
 
 ARG COMPOSE_VERSION
 
 RUN apt-get update && apt-get install --no-install-recommends -y \
     curl \
     gcc \
     git \
+    jq \
     libc-dev \
     libffi-dev \
-    libgcc-6-dev \
+    libgcc-10-dev \
     libssl-dev \
     make \
     openssl \
@@ -23,34 +24,34 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
 COPY --from=docker-cli /usr/local/bin/docker /usr/local/bin/docker
 
 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='[""]'); \
- fi && \
- git clone https://github.com/docker/compose.git && \
- cd /compose && \
- git checkout "${COMPOSE_VERSION}" && \
- pip3 install -U pip && \
- pip install -U --ignore-installed \
-   virtualenv \
-   tox && \
- PY_ARG=$(printf "$(python3 -V)" | awk '{print $2}' | awk 'BEGIN{FS=OFS="."} NF--' | sed 's|\.||g' | sed 's|^|py|g') && \
- sed -i "s|envlist = .*|envlist = ${PY_ARG},pre-commit|g" tox.ini && \
- tox --notest && \
- mkdir -p dist && \
- chmod 777 dist && \
- /compose/.tox/${PY_ARG}/bin/pip3 install -q -r requirements-build.txt && \
- echo "$(script/build/write-git-sha)" > compose/GITSHA && \
- export PATH="/compose/pyinstaller:${PATH}" && \
- /compose/.tox/${PY_ARG}/bin/pyinstaller --exclude-module pycrypto --exclude-module PyInstaller docker-compose.spec && \
- ls -la dist/ && \
- ldd dist/docker-compose && \
- mv dist/docker-compose /usr/local/bin && \
- docker-compose version
+  mkdir -p /compose && \
+  if [ -z ${COMPOSE_VERSION+x} ]; then \
+    COMPOSE_VERSION=$(curl -sX GET "https://api.github.com/repos/docker/compose/releases" \
+    | jq -r 'first(.[] | select(.tag_name | startswith("1."))) | .tag_name'); \
+  fi && \
+  git clone https://github.com/docker/compose.git && \
+  cd /compose && \
+  git checkout "${COMPOSE_VERSION}" && \
+  pip3 install -U pip && \
+  pip install -U --ignore-installed \
+    virtualenv \
+    tox && \
+  PY_ARG=$(printf "$(python3 -V)" | awk '{print $2}' | awk 'BEGIN{FS=OFS="."} NF--' | sed 's|\.||g' | sed 's|^|py|g') && \
+  sed -i "s|envlist = .*|envlist = ${PY_ARG},pre-commit|g" tox.ini && \
+  tox --notest && \
+  mkdir -p dist && \
+  chmod 777 dist && \
+  /compose/.tox/${PY_ARG}/bin/pip3 install -q -r requirements-build.txt && \
+  echo "$(script/build/write-git-sha)" > compose/GITSHA && \
+  export PATH="/compose/pyinstaller:${PATH}" && \
+  /compose/.tox/${PY_ARG}/bin/pyinstaller --exclude-module pycrypto --exclude-module PyInstaller docker-compose.spec && \
+  ls -la dist/ && \
+  ldd dist/docker-compose && \
+  mv dist/docker-compose /usr/local/bin && \
+  docker-compose version
 
 ############## runtime stage ##############
-FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-bionic
+FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-focal
 
 ARG BUILD_DATE
 ARG VERSION

Dockerfile.armhf

@@ -1,18 +1,19 @@
-ARG DOCKER_VERSION=19.03
+ARG DOCKER_VERSION=19.03.8
 
 FROM arm32v7/docker:${DOCKER_VERSION} AS docker-cli
 
-FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-bionic AS build
+FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-focal AS build
 
 ARG COMPOSE_VERSION
 
 RUN apt-get update && apt-get install --no-install-recommends -y \
     curl \
     gcc \
     git \
+    jq \
     libc-dev \
     libffi-dev \
-    libgcc-6-dev \
+    libgcc-10-dev \
     libssl-dev \
     make \
     openssl \
@@ -23,34 +24,34 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
 COPY --from=docker-cli /usr/local/bin/docker /usr/local/bin/docker
 
 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='[""]'); \
- fi && \
- git clone https://github.com/docker/compose.git && \
- cd /compose && \
- git checkout "${COMPOSE_VERSION}" && \
- pip3 install -U pip && \
- pip install -U --ignore-installed \
-   virtualenv \
-   tox && \
- PY_ARG=$(printf "$(python3 -V)" | awk '{print $2}' | awk 'BEGIN{FS=OFS="."} NF--' | sed 's|\.||g' | sed 's|^|py|g') && \
- sed -i "s|envlist = .*|envlist = ${PY_ARG},pre-commit|g" tox.ini && \
- tox --notest && \
- mkdir -p dist && \
- chmod 777 dist && \
- /compose/.tox/${PY_ARG}/bin/pip3 install -q -r requirements-build.txt && \
- echo "$(script/build/write-git-sha)" > compose/GITSHA && \
- export PATH="/compose/pyinstaller:${PATH}" && \
- /compose/.tox/${PY_ARG}/bin/pyinstaller --exclude-module pycrypto --exclude-module PyInstaller docker-compose.spec && \
- ls -la dist/ && \
- ldd dist/docker-compose && \
- mv dist/docker-compose /usr/local/bin && \
- docker-compose version
+  mkdir -p /compose && \
+  if [ -z ${COMPOSE_VERSION+x} ]; then \
+    COMPOSE_VERSION=$(curl -sX GET "https://api.github.com/repos/docker/compose/releases" \
+    | jq -r 'first(.[] | select(.tag_name | startswith("1."))) | .tag_name'); \
+  fi && \
+  git clone https://github.com/docker/compose.git && \
+  cd /compose && \
+  git checkout "${COMPOSE_VERSION}" && \
+  pip3 install -U pip && \
+  pip install -U --ignore-installed \
+    virtualenv \
+    tox && \
+  PY_ARG=$(printf "$(python3 -V)" | awk '{print $2}' | awk 'BEGIN{FS=OFS="."} NF--' | sed 's|\.||g' | sed 's|^|py|g') && \
+  sed -i "s|envlist = .*|envlist = ${PY_ARG},pre-commit|g" tox.ini && \
+  tox --notest && \
+  mkdir -p dist && \
+  chmod 777 dist && \
+  /compose/.tox/${PY_ARG}/bin/pip3 install -q -r requirements-build.txt && \
+  echo "$(script/build/write-git-sha)" > compose/GITSHA && \
+  export PATH="/compose/pyinstaller:${PATH}" && \
+  /compose/.tox/${PY_ARG}/bin/pyinstaller --exclude-module pycrypto --exclude-module PyInstaller docker-compose.spec && \
+  ls -la dist/ && \
+  ldd dist/docker-compose && \
+  mv dist/docker-compose /usr/local/bin && \
+  docker-compose version
 
 ############## runtime stage ##############
-FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-bionic
+FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-focal
 
 ARG BUILD_DATE
 ARG VERSION