From 5be05efdf1bb04b8924851144f213d1b14950ebf Mon Sep 17 00:00:00 2001 From: casjay Date: Fri, 6 Sep 2024 18:42:13 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=97=83=EF=B8=8F=20Committing=20everything?= =?UTF-8?q?=20that=20changed=20=F0=9F=97=83=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit .gitea/workflows/docker.19.04.yaml .gitea/workflows/docker.20.04.yaml .gitea/workflows/docker.21.04.yaml .gitea/workflows/docker.22.04.yaml .gitea/workflows/docker.23.04.yaml .gitea/workflows/docker.23.10.yaml .gitea/workflows/docker.24.04.yaml .gitea/workflows/docker.24.10.yaml .gitea/workflows/docker.yaml --- .gitea/workflows/docker.19.04.yaml | 4 ++-- .gitea/workflows/docker.20.04.yaml | 4 ++-- .gitea/workflows/docker.21.04.yaml | 4 ++-- .gitea/workflows/docker.22.04.yaml | 4 ++-- .gitea/workflows/docker.23.04.yaml | 6 +++--- .gitea/workflows/docker.23.10.yaml | 4 ++-- .gitea/workflows/docker.24.04.yaml | 12 ++++++++---- .gitea/workflows/docker.24.10.yaml | 4 ++-- .gitea/workflows/docker.yaml | 4 ++-- 9 files changed, 25 insertions(+), 21 deletions(-) diff --git a/.gitea/workflows/docker.19.04.yaml b/.gitea/workflows/docker.19.04.yaml index 46f1159..def22da 100644 --- a/.gitea/workflows/docker.19.04.yaml +++ b/.gitea/workflows/docker.19.04.yaml @@ -25,9 +25,9 @@ jobs: run: | echo DATE_TAG=$(date +'%y%m') >> $GITHUB_OUTPUT echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT + echo DOCKER_TAG=$([ -n "$TAG" ] && echo $TAG || echo "19.04") >> $GITHUB_OUTPUT + echo DOCKER_HUB=$([ -n "$HUB" ] && echo $HUB || echo "docker.io") >> $GITHUB_OUTPUT echo DOCKER_ORG=$([ -n "$ORG" ] && echo "$ORG" || echo "casjaysdev") >> $GITHUB_OUTPUT - echo DOCKER_TAG=$([ -n "$TAG" ] && echo ${DOCKER_TAG} || echo "19/04") >> $GITHUB_OUTPUT - echo DOCKER_HUB=$([ -n "$HUB" ] && echo ${DOCKER_HUB} || echo "docker.io") >> $GITHUB_OUTPUT echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}' | sed 's|^docker-||g') >> $GITHUB_OUTPUT - name: Set up Docker BuildX diff --git a/.gitea/workflows/docker.20.04.yaml b/.gitea/workflows/docker.20.04.yaml index 8c0eea6..70c4db1 100644 --- a/.gitea/workflows/docker.20.04.yaml +++ b/.gitea/workflows/docker.20.04.yaml @@ -25,9 +25,9 @@ jobs: run: | echo DATE_TAG=$(date +'%y%m') >> $GITHUB_OUTPUT echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT + echo DOCKER_TAG=$([ -n "$TAG" ] && echo $TAG || echo "20.04") >> $GITHUB_OUTPUT + echo DOCKER_HUB=$([ -n "$HUB" ] && echo $HUB || echo "docker.io") >> $GITHUB_OUTPUT echo DOCKER_ORG=$([ -n "$ORG" ] && echo "$ORG" || echo "casjaysdev") >> $GITHUB_OUTPUT - echo DOCKER_TAG=$([ -n "$TAG" ] && echo ${DOCKER_TAG} || echo "20.04") >> $GITHUB_OUTPUT - echo DOCKER_HUB=$([ -n "$HUB" ] && echo ${DOCKER_HUB} || echo "docker.io") >> $GITHUB_OUTPUT echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}' | sed 's|^docker-||g') >> $GITHUB_OUTPUT - name: Set up Docker BuildX diff --git a/.gitea/workflows/docker.21.04.yaml b/.gitea/workflows/docker.21.04.yaml index 718aecc..ddf3f25 100644 --- a/.gitea/workflows/docker.21.04.yaml +++ b/.gitea/workflows/docker.21.04.yaml @@ -25,9 +25,9 @@ jobs: run: | echo DATE_TAG=$(date +'%y%m') >> $GITHUB_OUTPUT echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT + echo DOCKER_TAG=$([ -n "$TAG" ] && echo $TAG || echo "21.04") >> $GITHUB_OUTPUT + echo DOCKER_HUB=$([ -n "$HUB" ] && echo $HUB || echo "docker.io") >> $GITHUB_OUTPUT echo DOCKER_ORG=$([ -n "$ORG" ] && echo "$ORG" || echo "casjaysdev") >> $GITHUB_OUTPUT - echo DOCKER_TAG=$([ -n "$TAG" ] && echo ${DOCKER_TAG} || echo "21.04") >> $GITHUB_OUTPUT - echo DOCKER_HUB=$([ -n "$HUB" ] && echo ${DOCKER_HUB} || echo "docker.io") >> $GITHUB_OUTPUT echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}' | sed 's|^docker-||g') >> $GITHUB_OUTPUT - name: Set up Docker BuildX diff --git a/.gitea/workflows/docker.22.04.yaml b/.gitea/workflows/docker.22.04.yaml index 3220853..df8bd65 100644 --- a/.gitea/workflows/docker.22.04.yaml +++ b/.gitea/workflows/docker.22.04.yaml @@ -25,9 +25,9 @@ jobs: run: | echo DATE_TAG=$(date +'%y%m') >> $GITHUB_OUTPUT echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT + echo DOCKER_TAG=$([ -n "$TAG" ] && echo $TAG || echo "22.04") >> $GITHUB_OUTPUT + echo DOCKER_HUB=$([ -n "$HUB" ] && echo $HUB || echo "docker.io") >> $GITHUB_OUTPUT echo DOCKER_ORG=$([ -n "$ORG" ] && echo "$ORG" || echo "casjaysdev") >> $GITHUB_OUTPUT - echo DOCKER_TAG=$([ -n "$TAG" ] && echo ${DOCKER_TAG} || echo "22.04") >> $GITHUB_OUTPUT - echo DOCKER_HUB=$([ -n "$HUB" ] && echo ${DOCKER_HUB} || echo "docker.io") >> $GITHUB_OUTPUT echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}' | sed 's|^docker-||g') >> $GITHUB_OUTPUT - name: Set up Docker BuildX diff --git a/.gitea/workflows/docker.23.04.yaml b/.gitea/workflows/docker.23.04.yaml index d876f56..6000df5 100644 --- a/.gitea/workflows/docker.23.04.yaml +++ b/.gitea/workflows/docker.23.04.yaml @@ -18,15 +18,15 @@ jobs: - name: Get Meta env: - TAG: 9 + TAG: 23.04 ORG: casjaysdev HUB: docker.io run: | echo DATE_TAG=$(date +'%y%m') >> $GITHUB_OUTPUT echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT + echo DOCKER_TAG=$([ -n "$TAG" ] && echo $TAG || echo "23.04") >> $GITHUB_OUTPUT + echo DOCKER_HUB=$([ -n "$HUB" ] && echo $HUB || echo "docker.io") >> $GITHUB_OUTPUT echo DOCKER_ORG=$([ -n "$ORG" ] && echo "$ORG" || echo "casjaysdev") >> $GITHUB_OUTPUT - echo DOCKER_TAG=$([ -n "$TAG" ] && echo ${DOCKER_TAG} || echo "9") >> $GITHUB_OUTPUT - echo DOCKER_HUB=$([ -n "$HUB" ] && echo ${DOCKER_HUB} || echo "docker.io") >> $GITHUB_OUTPUT echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}' | sed 's|^docker-||g') >> $GITHUB_OUTPUT - name: Set up Docker BuildX diff --git a/.gitea/workflows/docker.23.10.yaml b/.gitea/workflows/docker.23.10.yaml index 1611a70..c89b890 100644 --- a/.gitea/workflows/docker.23.10.yaml +++ b/.gitea/workflows/docker.23.10.yaml @@ -25,9 +25,9 @@ jobs: run: | echo DATE_TAG=$(date +'%y%m') >> $GITHUB_OUTPUT echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT + echo DOCKER_TAG=$([ -n "$TAG" ] && echo $TAG || echo "23.10") >> $GITHUB_OUTPUT + echo DOCKER_HUB=$([ -n "$HUB" ] && echo $HUB || echo "docker.io") >> $GITHUB_OUTPUT echo DOCKER_ORG=$([ -n "$ORG" ] && echo "$ORG" || echo "casjaysdev") >> $GITHUB_OUTPUT - echo DOCKER_TAG=$([ -n "$TAG" ] && echo ${DOCKER_TAG} || echo "23.10") >> $GITHUB_OUTPUT - echo DOCKER_HUB=$([ -n "$HUB" ] && echo ${DOCKER_HUB} || echo "docker.io") >> $GITHUB_OUTPUT echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}' | sed 's|^docker-||g') >> $GITHUB_OUTPUT - name: Set up Docker BuildX diff --git a/.gitea/workflows/docker.24.04.yaml b/.gitea/workflows/docker.24.04.yaml index d17c58d..caf5985 100644 --- a/.gitea/workflows/docker.24.04.yaml +++ b/.gitea/workflows/docker.24.04.yaml @@ -18,12 +18,16 @@ jobs: - name: Get Meta id: meta + env: + TAG: 24.04 + ORG: casjaysdev + HUB: docker.io run: | - echo DOCKER_TAG=24.04 >> $GITHUB_OUTPUT - echo DOCKER_TAG_NAME=noble >> $GITHUB_OUTPUT + echo DATE_TAG=$(date +'%y%m') >> $GITHUB_OUTPUT echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT - echo DOCKER_ORG=$(echo "casjaysdev") >> $GITHUB_OUTPUT - echo DOCKER_HUB=$([ -n "$DOCKER_HUB" ] && echo ${DOCKER_HUB} || echo "docker.io") >> $GITHUB_OUTPUT + echo DOCKER_TAG=$([ -n "$TAG" ] && echo $TAG || echo "24.04") >> $GITHUB_OUTPUT + echo DOCKER_HUB=$([ -n "$HUB" ] && echo $HUB || echo "docker.io") >> $GITHUB_OUTPUT + echo DOCKER_ORG=$([ -n "$ORG" ] && echo "$ORG" || echo "casjaysdev") >> $GITHUB_OUTPUT echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}' | sed 's|^docker-||g') >> $GITHUB_OUTPUT - name: Set up Docker BuildX diff --git a/.gitea/workflows/docker.24.10.yaml b/.gitea/workflows/docker.24.10.yaml index 0975941..9e3db71 100644 --- a/.gitea/workflows/docker.24.10.yaml +++ b/.gitea/workflows/docker.24.10.yaml @@ -25,9 +25,9 @@ jobs: run: | echo DATE_TAG=$(date +'%y%m') >> $GITHUB_OUTPUT echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT + echo DOCKER_TAG=$([ -n "$TAG" ] && echo $TAG || echo "24.10") >> $GITHUB_OUTPUT + echo DOCKER_HUB=$([ -n "$HUB" ] && echo $HUB || echo "docker.io") >> $GITHUB_OUTPUT echo DOCKER_ORG=$([ -n "$ORG" ] && echo "$ORG" || echo "casjaysdev") >> $GITHUB_OUTPUT - echo DOCKER_TAG=$([ -n "$TAG" ] && echo ${DOCKER_TAG} || echo "19/04") >> $GITHUB_OUTPUT - echo DOCKER_HUB=$([ -n "$HUB" ] && echo ${DOCKER_HUB} || echo "docker.io") >> $GITHUB_OUTPUT echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}' | sed 's|^docker-||g') >> $GITHUB_OUTPUT - name: Set up Docker BuildX diff --git a/.gitea/workflows/docker.yaml b/.gitea/workflows/docker.yaml index eb5374c..80d20ef 100644 --- a/.gitea/workflows/docker.yaml +++ b/.gitea/workflows/docker.yaml @@ -25,9 +25,9 @@ jobs: run: | echo DATE_TAG=$(date +'%y%m') >> $GITHUB_OUTPUT echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT + echo DOCKER_TAG=$([ -n "$TAG" ] && echo $TAG || echo "latest") >> $GITHUB_OUTPUT + echo DOCKER_HUB=$([ -n "$HUB" ] && echo $HUB || echo "docker.io") >> $GITHUB_OUTPUT echo DOCKER_ORG=$([ -n "$ORG" ] && echo "$ORG" || echo "casjaysdev") >> $GITHUB_OUTPUT - echo DOCKER_TAG=$([ -n "$TAG" ] && echo ${DOCKER_TAG} || echo "latest") >> $GITHUB_OUTPUT - echo DOCKER_HUB=$([ -n "$HUB" ] && echo ${DOCKER_HUB} || echo "docker.io") >> $GITHUB_OUTPUT echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}' | sed 's|^docker-||g') >> $GITHUB_OUTPUT - name: Set up Docker BuildX