From 2ae09a07e6d7da069a8ac2791e0192c06a9fb8a7 Mon Sep 17 00:00:00 2001 From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com> Date: Sat, 11 Apr 2020 12:39:12 -0700 Subject: [PATCH 1/9] Some css syntax fixes --- data/interfaces/default/css/tautulli.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/interfaces/default/css/tautulli.css b/data/interfaces/default/css/tautulli.css index 50e387c8..af3c42a9 100644 --- a/data/interfaces/default/css/tautulli.css +++ b/data/interfaces/default/css/tautulli.css @@ -1034,13 +1034,13 @@ a .users-poster-face:hover { } .dashboard-activity-container:hover .progress-bar { color: rgba(255, 255, 255, 1); - background-image: -webkit-linear-gradient(left,rgba(0,0,0,0.25),0%,rgba(0,0,0,0),50px); + background-image: -webkit-linear-gradient(left,rgba(0,0,0,0.25) 0%,rgba(0,0,0,0) 50px); background-image: -moz-linear-gradient(left,rgba(0,0,0,0.25) 0%,rgba(0,0,0,0) 50px); background-image: linear-gradient(to left,rgba(0,0,0,0.25) 0%,rgba(0,0,0,0) 50px); } .dashboard-activity-container:hover .buffer-bar { color: rgba(255, 255, 255, 1); - background-image: -webkit-linear-gradient(left,rgba(0,0,0,0.25),0%,rgba(0,0,0,0),50px); + background-image: -webkit-linear-gradient(left,rgba(0,0,0,0.25) 0%,rgba(0,0,0,0) 50px); background-image: -moz-linear-gradient(left,rgba(0,0,0,0.25) 0%,rgba(0,0,0,0) 50px); background-image: linear-gradient(to left,rgba(0,0,0,0.25) 0%,rgba(0,0,0,0) 50px); } @@ -1740,7 +1740,7 @@ a:hover .dashboard-recent-media-cover { top: 0; bottom: 0; background-image: -webkit-gradient(linear,left 0,left 100%,from(rgba(0,0,0,.7)),to(rgba(0,0,0,.9))); - background-image: -webkit-linear-gradient(top,rgba(0,0,0,.7),0,rgba(0,0,0,.9),100%); + background-image: -webkit-linear-gradient(top,rgba(0,0,0,.7) 0,rgba(0,0,0,.9) 100%); background-image: -moz-linear-gradient(top,rgba(0,0,0,.7) 0,rgba(0,0,0,.9) 100%); background-image: linear-gradient(to bottom,rgba(0,0,0,.7) 0,rgba(0,0,0,.9) 100%); background-repeat: repeat-x; From 1271458f832615a08036af2986b09e66a0bc4aab Mon Sep 17 00:00:00 2001 From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com> Date: Sat, 11 Apr 2020 12:40:51 -0700 Subject: [PATCH 2/9] Fix web app manifest file (Fixes Tautulli/Tautulli-Issues#232) --- data/interfaces/default/images/favicon/browserconfig.xml | 2 +- data/interfaces/default/images/favicon/manifest.json | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/data/interfaces/default/images/favicon/browserconfig.xml b/data/interfaces/default/images/favicon/browserconfig.xml index 58f4aee7..7244b771 100644 --- a/data/interfaces/default/images/favicon/browserconfig.xml +++ b/data/interfaces/default/images/favicon/browserconfig.xml @@ -2,7 +2,7 @@ - + #282a2d diff --git a/data/interfaces/default/images/favicon/manifest.json b/data/interfaces/default/images/favicon/manifest.json index 98ba817a..07aea6c2 100644 --- a/data/interfaces/default/images/favicon/manifest.json +++ b/data/interfaces/default/images/favicon/manifest.json @@ -1,13 +1,14 @@ { "name": "Tautulli", + "start_url": "/", "icons": [ { - "src": "${http_root}images/favicon/android-chrome-192x192.png?v=2.0.5", + "src": "android-chrome-192x192.png?v=2.0.5", "sizes": "192x192", "type": "image/png" }, { - "src": "${http_root}images/favicon/android-chrome-256x256.png?v=2.0.5", + "src": "android-chrome-256x256.png?v=2.0.5", "sizes": "256x256", "type": "image/png" } From d0fa83bb8cddf622afbccedc6001bd064983ae9e Mon Sep 17 00:00:00 2001 From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com> Date: Sat, 11 Apr 2020 20:39:39 -0700 Subject: [PATCH 3/9] Use Kodi platform image for xbmc (Fixes Tautulli/Tautulli-Issues##231) --- data/interfaces/default/css/tautulli.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/interfaces/default/css/tautulli.css b/data/interfaces/default/css/tautulli.css index af3c42a9..12113551 100644 --- a/data/interfaces/default/css/tautulli.css +++ b/data/interfaces/default/css/tautulli.css @@ -3932,7 +3932,7 @@ a:hover .overlay-refresh-image:hover { } .platform-xbmc { background-color: #3b4872; - background-image: url(../images/platforms/xbmc.svg); + background-image: url(../images/platforms/kodi.svg); } .platform-xbox { background-color: #107c10; From 88711e760121b4ee2d93e0c79456c70298fa4a54 Mon Sep 17 00:00:00 2001 From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com> Date: Sun, 12 Apr 2020 10:43:30 -0700 Subject: [PATCH 4/9] Add more info to manifest.json --- data/interfaces/default/images/favicon/manifest.json | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/data/interfaces/default/images/favicon/manifest.json b/data/interfaces/default/images/favicon/manifest.json index 07aea6c2..82b8b475 100644 --- a/data/interfaces/default/images/favicon/manifest.json +++ b/data/interfaces/default/images/favicon/manifest.json @@ -1,6 +1,9 @@ { - "name": "Tautulli", - "start_url": "/", + "name": "Tautulli: Monitor your Plex Media Server", + "short_name": "Tautulli", + "Description": "A Python based monitoring and tracking tool for Plex Media Server.", + "start_url": "/", + "scope": "/", "icons": [ { "src": "android-chrome-192x192.png?v=2.0.5", @@ -15,5 +18,6 @@ ], "theme_color": "#282a2d", "background_color": "#282a2d", - "display": "standalone" + "display": "standalone", + "orientation": "any" } \ No newline at end of file From 9097e79e4fe8b6eb74adf85d54058038284e350f Mon Sep 17 00:00:00 2001 From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com> Date: Sun, 12 Apr 2020 11:33:23 -0700 Subject: [PATCH 5/9] Change web app manifest start url to relative path --- data/interfaces/default/images/favicon/manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/interfaces/default/images/favicon/manifest.json b/data/interfaces/default/images/favicon/manifest.json index 82b8b475..cd68328c 100644 --- a/data/interfaces/default/images/favicon/manifest.json +++ b/data/interfaces/default/images/favicon/manifest.json @@ -2,8 +2,8 @@ "name": "Tautulli: Monitor your Plex Media Server", "short_name": "Tautulli", "Description": "A Python based monitoring and tracking tool for Plex Media Server.", - "start_url": "/", - "scope": "/", + "start_url": "../../", + "scope": "../../", "icons": [ { "src": "android-chrome-192x192.png?v=2.0.5", From f7f76d82b6e82c4fb8c84100eacadb30d30b5421 Mon Sep 17 00:00:00 2001 From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com> Date: Sun, 12 Apr 2020 17:56:15 -0700 Subject: [PATCH 6/9] Add Docker buildx GitHub workflow --- .dockerignore | 3 + .github/workflows/publish-docker.yml | 82 +++++++++++++++++++ ...publishrelease.yml => publish-release.yml} | 7 +- .github/workflows/publishdocker-branch.yml | 30 ------- .github/workflows/publishdocker-release.yml | 32 -------- Dockerfile | 16 +--- 6 files changed, 92 insertions(+), 78 deletions(-) create mode 100644 .github/workflows/publish-docker.yml rename .github/workflows/{publishrelease.yml => publish-release.yml} (87%) delete mode 100644 .github/workflows/publishdocker-branch.yml delete mode 100644 .github/workflows/publishdocker-release.yml diff --git a/.dockerignore b/.dockerignore index f535c9c7..742c4925 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,5 +1,8 @@ .git .github .gitignore +contrib +init-scripts +pylintrc *.md !CHANGELOG*.md diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml new file mode 100644 index 00000000..215e34ed --- /dev/null +++ b/.github/workflows/publish-docker.yml @@ -0,0 +1,82 @@ +name: Publish Docker +on: + push: + branches: [master, beta, nightly] + tags: [v*] +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Prepare + id: prepare + run: | + if [[ $GITHUB_REF == refs/tags/* ]]; then + echo ::set-output name=version::${GITHUB_REF#refs/tags/} + elif [[ $GITHUB_REF == refs/heads/master ]]; then + echo ::set-output name=version::latest + else + echo ::set-output name=version::${GITHUB_REF#refs/heads/} + fi + if [[ $GITHUB_REF == refs/tags/* ]]; then + echo ::set-output name=branch::master + else + echo ::set-output name=branch::${GITHUB_REF#refs/heads/} + fi + echo ::set-output name=build_date::$(date -u +'%Y-%m-%dT%H:%M:%SZ') + echo ::set-output name=docker_platforms::linux/amd64,linux/arm64,linux/arm + echo ::set-output name=docker_image::tautulli/tautulli + + - name: Set up Docker Buildx + id: buildx + uses: crazy-max/ghaction-docker-buildx@v1 + with: + version: latest + + - name: Checkout + uses: actions/checkout@v2 + + - name: Docker Buildx (no push) + run: | + docker buildx build \ + --platform ${{ steps.prepare.outputs.docker_platforms }} \ + --output "type=image,push=false" \ + --build-arg "VERSION=${{ steps.prepare.outputs.version }}" \ + --build-arg "BRANCH=${{ steps.prepare.outputs.branch }}" \ + --build-arg "BUILD_DATE=${{ steps.prepare.outputs.build_date }}" \ + --build-arg "VCS_REF=${GITHUB_SHA::8}" \ + --tag "${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.version }}" \ + --file Dockerfile . + + - name: Docker Login + if: success() + env: + DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} + run: | + echo "${DOCKER_PASSWORD}" | docker login --username "${{ secrets.DOCKER_USERNAME }}" --password-stdin + + - name: Docker Buildx (push) + if: success() + run: | + docker buildx build \ + --platform ${{ steps.prepare.outputs.docker_platforms }} \ + --output "type=image,push=true" \ + --build-arg "VERSION=${{ steps.prepare.outputs.version }}" \ + --build-arg "BRANCH=${{ steps.prepare.outputs.branch }}" \ + --build-arg "BUILD_DATE=${{ steps.prepare.outputs.build_date }}" \ + --build-arg "VCS_REF=${GITHUB_SHA::8}" \ + --tag "${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.version }}" \ + --file Dockerfile . + + - name: Clear + if: always() + run: | + rm -f ${HOME}/.docker/config.json + + - name: Post Status to Discord + uses: sarisia/actions-status-discord@v1 + if: always() + with: + webhook: ${{ secrets.DISCORD_WEBHOOK }} + status: ${{ job.status }} + job: ${{ github.workflow }} + nofail: true diff --git a/.github/workflows/publishrelease.yml b/.github/workflows/publish-release.yml similarity index 87% rename from .github/workflows/publishrelease.yml rename to .github/workflows/publish-release.yml index f5e0b5d9..8834af3f 100644 --- a/.github/workflows/publishrelease.yml +++ b/.github/workflows/publish-release.yml @@ -1,8 +1,7 @@ -name: Create Release +name: Publish Release on: push: - tags: - - 'v*' + tags: [v*] jobs: build: runs-on: ubuntu-latest @@ -10,7 +9,7 @@ jobs: - name: Checkout Code uses: actions/checkout@master - name: Get Release Version - run: echo ::set-env name=RELEASE_VERSION::${GITHUB_REF/refs\/tags\//} + run: echo ::set-env name=RELEASE_VERSION::${GITHUB_REF#refs/tags/} - name: Get Changelog run: echo ::set-env name=CHANGELOG::"$( sed -n '/^## /{p; :loop n; p; /^## /q; b loop}' CHANGELOG.md | sed '$d' | sed '$d' | sed '$d' | sed ':a;N;$!ba;s/\n/%0A/g' )" - name: Create Release diff --git a/.github/workflows/publishdocker-branch.yml b/.github/workflows/publishdocker-branch.yml deleted file mode 100644 index b8a6b336..00000000 --- a/.github/workflows/publishdocker-branch.yml +++ /dev/null @@ -1,30 +0,0 @@ -name: Publish Docker Branch -on: - push: - branches: [master, beta, nightly] -jobs: - build: - runs-on: ubuntu-latest - steps: - - name: Checkout Code - uses: actions/checkout@master - - name: Get Branch - run: echo ::set-env name=BRANCH::${GITHUB_REF#refs/heads/} - - name: Publish to Registry - uses: elgohr/Publish-Docker-Github-Action@master - env: - VERSION: ${{ github.sha }} - with: - name: tautulli/tautulli - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - dockerfile: Dockerfile - buildargs: VERSION, BRANCH - - name: Post Status to Discord - uses: sarisia/actions-status-discord@v1 - if: always() - with: - webhook: ${{ secrets.DISCORD_WEBHOOK }} - status: ${{ job.status }} - job: ${{ github.workflow }} - nofail: true diff --git a/.github/workflows/publishdocker-release.yml b/.github/workflows/publishdocker-release.yml deleted file mode 100644 index 96f5bb66..00000000 --- a/.github/workflows/publishdocker-release.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: Publish Docker Release -on: - push: - tags: - - 'v*' -jobs: - build: - runs-on: ubuntu-latest - steps: - - name: Checkout Code - uses: actions/checkout@master - - name: Get Branch - run: echo ::set-env name=BRANCH::${GITHUB_REF/refs\/tags\//} - - name: Publish to Registry - uses: elgohr/Publish-Docker-Github-Action@master - env: - VERSION: ${{ github.sha }} - with: - name: tautulli/tautulli - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - dockerfile: Dockerfile - buildargs: VERSION, BRANCH - tags: ${{ env.BRANCH }} - - name: Post Status to Discord - uses: sarisia/actions-status-discord@v1 - if: always() - with: - webhook: ${{ secrets.DISCORD_WEBHOOK }} - status: ${{ job.status }} - job: ${{ github.workflow }} - nofail: true diff --git a/Dockerfile b/Dockerfile index 5efa135a..0467f616 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ -FROM python:2.7.17-slim +FROM tautulli/tautulli-baseimage:latest -LABEL maintainer="TheMeanCanEHdian" +LABEL maintainer="Tautulli" ARG VERSION ARG BRANCH @@ -11,16 +11,8 @@ ENV TZ=UTC WORKDIR /app RUN \ -apt-get -q -y update --no-install-recommends && \ -apt-get install -q -y --no-install-recommends \ - curl && \ -rm -rf /var/lib/apt/lists/* && \ -pip install --no-cache-dir --upgrade pip && \ -pip install --no-cache-dir --upgrade \ - pycryptodomex \ - pyopenssl && \ -echo ${VERSION} > /app/version.txt && \ -echo ${BRANCH} > /app/branch.txt + echo ${VERSION} > /app/version.txt && \ + echo ${BRANCH} > /app/branch.txt COPY . /app From f39ecd89a7695c1b2a9a264b47309264c8767f0c Mon Sep 17 00:00:00 2001 From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com> Date: Sun, 12 Apr 2020 18:03:40 -0700 Subject: [PATCH 7/9] Docker docker build badges on README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c74386ec..1240c0d9 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ This project is based on code from [Headphones](https://github.com/rembo10/headp | Status | Branch: `master` | Branch: `beta` | Branch: `nightly` | | --- | --- | --- | --- | | Release | [![Release@master](https://img.shields.io/github/v/release/Tautulli/Tautulli?style=flat-square)](https://github.com/Tautulli/Tautulli/releases/latest)
[![Release Date@master](https://img.shields.io/github/release-date/Tautulli/Tautulli?style=flat-square&color=blue)](https://github.com/Tautulli/Tautulli/releases/latest) | [![Release@beta](https://img.shields.io/github/v/release/Tautulli/Tautulli?include_prereleases&style=flat-square)](https://github.com/Tautulli/Tautulli/releases)
[![Commits@nightly](https://img.shields.io/github/commits-since/Tautulli/Tautulli/latest/beta?style=flat-square&color=blue)](https://github.com/Tautulli/Tautulli/commits/beta) | [![Last Commits@nightly](https://img.shields.io/github/last-commit/Tautulli/Tautulli/nightly?style=flat-square&color=blue)](https://github.com/Tautulli/Tautulli/commits/nightly)
[![Commits@nightly](https://img.shields.io/github/commits-since/Tautulli/Tautulli/latest/nightly?style=flat-square&color=blue)](https://github.com/Tautulli/Tautulli/commits/nightly) | -| Docker | [![Docker@master](https://img.shields.io/badge/tautulli-tautulli:latest-blue?style=flat-square)](https://hub.docker.com/r/tautulli/tautulli)
[![Docker Build@master](https://img.shields.io/github/workflow/status/Tautulli/Tautulli/Publish%20Docker%20Branch/master?style=flat-square)](https://github.com/Tautulli/Tautulli/actions?query=branch%3Amaster) | [![Docker@beta](https://img.shields.io/badge/tautulli-tautulli:beta-blue?style=flat-square)](https://hub.docker.com/r/tautulli/tautulli)
[![Docker Build@beta](https://img.shields.io/github/workflow/status/Tautulli/Tautulli/Publish%20Docker%20Branch/beta?style=flat-square)](https://github.com/Tautulli/Tautulli/actions?query=branch%3Abeta) | [![Docker@nightly](https://img.shields.io/badge/tautulli-tautulli:nightly-blue?style=flat-square)](https://hub.docker.com/r/tautulli/tautulli)
[![Docker Build@nightly](https://img.shields.io/github/workflow/status/Tautulli/Tautulli/Publish%20Docker%20Branch/nightly?style=flat-square)](https://github.com/Tautulli/Tautulli/actions?query=branch%3Anightly) | +| Docker | [![Docker@master](https://img.shields.io/badge/tautulli-tautulli:latest-blue?style=flat-square)](https://hub.docker.com/r/tautulli/tautulli)
[![Docker Build@master](https://img.shields.io/github/workflow/status/Tautulli/Tautulli/Publish%20Docker/master?style=flat-square)](https://github.com/Tautulli/Tautulli/actions?query=workflow%3A"Publish+Docker"+branch%3Amaster) | [![Docker@beta](https://img.shields.io/badge/tautulli-tautulli:beta-blue?style=flat-square)](https://hub.docker.com/r/tautulli/tautulli)
[![Docker Build@master](https://img.shields.io/github/workflow/status/Tautulli/Tautulli/Publish%20Docker/beta?style=flat-square)](https://github.com/Tautulli/Tautulli/actions?query=workflow%3A"Publish+Docker"+branch%3Abeta) | [![Docker@nightly](https://img.shields.io/badge/tautulli-tautulli:nightly-blue?style=flat-square)](https://hub.docker.com/r/tautulli/tautulli)
[![Docker Build@master](https://img.shields.io/github/workflow/status/Tautulli/Tautulli/Publish%20Docker/nightly?style=flat-square)](https://github.com/Tautulli/Tautulli/actions?query=workflow%3A"Publish+Docker"+branch%3Anightly) | [![Wiki](https://img.shields.io/badge/github-wiki-black?style=flat-square)](https://github.com/Tautulli/Tautulli-Wiki/wiki) [![Discord](https://img.shields.io/discord/183396325142822912?label=discord&style=flat-square&color=7289DA)](https://tautulli.com/discord) From 38db0b7a70ea8af52e85ede6b5f09808989eccfc Mon Sep 17 00:00:00 2001 From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com> Date: Sun, 12 Apr 2020 18:15:14 -0700 Subject: [PATCH 8/9] Rename VERSION to COMMIT in Dockerfile --- .github/workflows/publish-docker.yml | 5 +++-- Dockerfile | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml index 215e34ed..c287350a 100644 --- a/.github/workflows/publish-docker.yml +++ b/.github/workflows/publish-docker.yml @@ -22,6 +22,7 @@ jobs: else echo ::set-output name=branch::${GITHUB_REF#refs/heads/} fi + echo ::set-output name=commit::${GITHUB_SHA} echo ::set-output name=build_date::$(date -u +'%Y-%m-%dT%H:%M:%SZ') echo ::set-output name=docker_platforms::linux/amd64,linux/arm64,linux/arm echo ::set-output name=docker_image::tautulli/tautulli @@ -42,8 +43,8 @@ jobs: --output "type=image,push=false" \ --build-arg "VERSION=${{ steps.prepare.outputs.version }}" \ --build-arg "BRANCH=${{ steps.prepare.outputs.branch }}" \ + --build-arg "COMMIT=${{ steps.prepare.outputs.commit }}" \ --build-arg "BUILD_DATE=${{ steps.prepare.outputs.build_date }}" \ - --build-arg "VCS_REF=${GITHUB_SHA::8}" \ --tag "${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.version }}" \ --file Dockerfile . @@ -62,8 +63,8 @@ jobs: --output "type=image,push=true" \ --build-arg "VERSION=${{ steps.prepare.outputs.version }}" \ --build-arg "BRANCH=${{ steps.prepare.outputs.branch }}" \ + --build-arg "COMMIT=${{ steps.prepare.outputs.commit }}" \ --build-arg "BUILD_DATE=${{ steps.prepare.outputs.build_date }}" \ - --build-arg "VCS_REF=${GITHUB_SHA::8}" \ --tag "${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.version }}" \ --file Dockerfile . diff --git a/Dockerfile b/Dockerfile index 0467f616..49e89b5b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,8 +2,8 @@ FROM tautulli/tautulli-baseimage:latest LABEL maintainer="Tautulli" -ARG VERSION ARG BRANCH +ARG COMMIT ENV TAUTULLI_DOCKER=True ENV TZ=UTC @@ -11,8 +11,8 @@ ENV TZ=UTC WORKDIR /app RUN \ - echo ${VERSION} > /app/version.txt && \ - echo ${BRANCH} > /app/branch.txt + echo ${BRANCH} > /app/branch.txt && \ + echo ${COMMIT} > /app/version.txt COPY . /app From e0cd6f707124eb7eadc3aa27ad0ae5bba1a5fd74 Mon Sep 17 00:00:00 2001 From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com> Date: Sun, 12 Apr 2020 18:18:08 -0700 Subject: [PATCH 9/9] Rename docker build arg VERSION to TAG --- .github/workflows/publish-docker.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml index c287350a..8c9a624e 100644 --- a/.github/workflows/publish-docker.yml +++ b/.github/workflows/publish-docker.yml @@ -11,11 +11,11 @@ jobs: id: prepare run: | if [[ $GITHUB_REF == refs/tags/* ]]; then - echo ::set-output name=version::${GITHUB_REF#refs/tags/} + echo ::set-output name=tag::${GITHUB_REF#refs/tags/} elif [[ $GITHUB_REF == refs/heads/master ]]; then - echo ::set-output name=version::latest + echo ::set-output name=tag::latest else - echo ::set-output name=version::${GITHUB_REF#refs/heads/} + echo ::set-output name=tag::${GITHUB_REF#refs/heads/} fi if [[ $GITHUB_REF == refs/tags/* ]]; then echo ::set-output name=branch::master @@ -41,11 +41,11 @@ jobs: docker buildx build \ --platform ${{ steps.prepare.outputs.docker_platforms }} \ --output "type=image,push=false" \ - --build-arg "VERSION=${{ steps.prepare.outputs.version }}" \ + --build-arg "TAG=${{ steps.prepare.outputs.tag }}" \ --build-arg "BRANCH=${{ steps.prepare.outputs.branch }}" \ --build-arg "COMMIT=${{ steps.prepare.outputs.commit }}" \ --build-arg "BUILD_DATE=${{ steps.prepare.outputs.build_date }}" \ - --tag "${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.version }}" \ + --tag "${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.tag }}" \ --file Dockerfile . - name: Docker Login @@ -61,11 +61,11 @@ jobs: docker buildx build \ --platform ${{ steps.prepare.outputs.docker_platforms }} \ --output "type=image,push=true" \ - --build-arg "VERSION=${{ steps.prepare.outputs.version }}" \ + --build-arg "TAG=${{ steps.prepare.outputs.tag }}" \ --build-arg "BRANCH=${{ steps.prepare.outputs.branch }}" \ --build-arg "COMMIT=${{ steps.prepare.outputs.commit }}" \ --build-arg "BUILD_DATE=${{ steps.prepare.outputs.build_date }}" \ - --tag "${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.version }}" \ + --tag "${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.tag }}" \ --file Dockerfile . - name: Clear