diff --git a/.gitea/workflows/docker.8.yaml b/.gitea/workflows/docker.8.yaml index 6aba4e9..d0b40b4 100644 --- a/.gitea/workflows/docker.8.yaml +++ b/.gitea/workflows/docker.8.yaml @@ -18,11 +18,16 @@ jobs: - name: Get Meta id: meta + env: + TAG: 8 + ORG: ${{ vars.DOCKER_ORG }} + HUB: ${{ vars.DOCKER_HUB }} run: | - echo DOCKER_TAG=8 >> $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 ${GITHUB_REPOSITORY} | awk -F"/" '{print $1}') >> $GITHUB_OUTPUT - echo DOCKER_HUB=$([ -n "$DOCKER_HUB" ] && echo ${DOCKER_HUB} || echo "docker.io") >> $GITHUB_OUTPUT + echo DOCKER_ORG=$([ -n "$ORG" ] && echo "$ORG" || echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $1}') >> $GITHUB_OUTPUT + echo DOCKER_TAG=$([ -n "$TAG" ] && echo ${DOCKER_TAG} || echo "8") >> $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.9.yaml b/.gitea/workflows/docker.9.yaml index 279e52c..83a0518 100644 --- a/.gitea/workflows/docker.9.yaml +++ b/.gitea/workflows/docker.9.yaml @@ -18,11 +18,16 @@ jobs: - name: Get Meta id: meta + env: + TAG: 9 + ORG: ${{ vars.DOCKER_ORG }} + HUB: ${{ vars.DOCKER_HUB }} run: | - echo DOCKER_TAG=9 >> $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 ${GITHUB_REPOSITORY} | awk -F"/" '{print $1}') >> $GITHUB_OUTPUT - echo DOCKER_HUB=$([ -n "$DOCKER_HUB" ] && echo ${DOCKER_HUB} || echo "docker.io") >> $GITHUB_OUTPUT + echo DOCKER_ORG=$([ -n "$ORG" ] && echo "$ORG" || echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $1}') >> $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.yaml b/.gitea/workflows/docker.yaml index e161f43..a8171fd 100644 --- a/.gitea/workflows/docker.yaml +++ b/.gitea/workflows/docker.yaml @@ -18,12 +18,16 @@ jobs: - name: Get Meta id: meta + env: + ORG: ${{ vars.DOCKER_ORG }} + TAG: ${{ vars.DOCKER_TAG }} + HUB: ${{ vars.DOCKER_HUB }} run: | echo DATE_TAG=$(date +'%y%m') >> $GITHUB_OUTPUT echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT - echo DOCKER_ORG=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $1}') >> $GITHUB_OUTPUT - echo DOCKER_TAG=$([ -n "$DOCKER_TAG" ] && echo ${DOCKER_TAG} || echo "latest") >> $GITHUB_OUTPUT - echo DOCKER_HUB=$([ -n "$DOCKER_HUB" ] && echo ${DOCKER_HUB} || echo "docker.io") >> $GITHUB_OUTPUT + echo DOCKER_ORG=$([ -n "$ORG" ] && echo "$ORG" || echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $1}') >> $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