Compare commits

..

No commits in common. "4de96e858a4d4efbcd62d26e1d7bcae9921a3838" and "ff7ef761d0d9e7a5204c854e4db4fae63bf7acee" have entirely different histories.

2 changed files with 1 additions and 32 deletions

View File

@ -9,7 +9,6 @@ env:
run-unit-tests: ${{ secrets.RUN_UNIT_TESTS != null }} run-unit-tests: ${{ secrets.RUN_UNIT_TESTS != null }}
docker-hub-credentials: ${{ secrets.DOCKER_HUB_USERNAME != null && secrets.DOCKER_HUB_TOKEN != null }} docker-hub-credentials: ${{ secrets.DOCKER_HUB_USERNAME != null && secrets.DOCKER_HUB_TOKEN != null }}
ghcr-credentials: ${{ secrets.GHCR_USERNAME != null && secrets.GHCR_TOKEN != null }} ghcr-credentials: ${{ secrets.GHCR_USERNAME != null && secrets.GHCR_TOKEN != null }}
gitea-credentials: ${{ secrets.GITEA_USERNAME != null && secrets.GITEA_TOKEN != null }}
docker-hub-namespace: ${{ secrets.DOCKER_HUB_NAMESPACE || github.repository_owner }} docker-hub-namespace: ${{ secrets.DOCKER_HUB_NAMESPACE || github.repository_owner }}
docker-hub-namespace-upstream: ${{ secrets.DOCKER_HUB_NAMESPACE_UPSTREAM || 'zmkfirmware' }} docker-hub-namespace-upstream: ${{ secrets.DOCKER_HUB_NAMESPACE_UPSTREAM || 'zmkfirmware' }}
ghcr-namespace: ${{ github.repository_owner }} ghcr-namespace: ${{ github.repository_owner }}
@ -107,14 +106,6 @@ jobs:
registry: ghcr.io registry: ghcr.io
username: ${{ secrets.GHCR_USERNAME }} username: ${{ secrets.GHCR_USERNAME }}
password: ${{ secrets.GHCR_TOKEN }} password: ${{ secrets.GHCR_TOKEN }}
- name: Login to Gitea
id: docker-hub-login
if: ${{ env.gitea-credentials == 'true' }}
uses: docker/login-action@v2
with:
registry: git.sporq.de
username: ${{ secrets.GITEA_USERNAME }}
password: ${{ secrets.GITEA_TOKEN }}
- name: Define paths - name: Define paths
id: paths id: paths
env: env:
@ -221,14 +212,6 @@ jobs:
registry: ghcr.io registry: ghcr.io
username: ${{ secrets.GHCR_USERNAME }} username: ${{ secrets.GHCR_USERNAME }}
password: ${{ secrets.GHCR_TOKEN }} password: ${{ secrets.GHCR_TOKEN }}
- name: Login to Gitea
id: docker-hub-login
if: ${{ env.gitea-credentials == 'true' }}
uses: docker/login-action@v2
with:
registry: git.sporq.de
username: ${{ secrets.GITEA_USERNAME }}
password: ${{ secrets.GITEA_TOKEN }}
- name: Define repositories - name: Define repositories
id: repositories id: repositories
shell: bash shell: bash
@ -587,13 +570,6 @@ jobs:
with: with:
username: ${{ secrets.DOCKER_HUB_USERNAME }} username: ${{ secrets.DOCKER_HUB_USERNAME }}
password: ${{ secrets.DOCKER_HUB_TOKEN }} password: ${{ secrets.DOCKER_HUB_TOKEN }}
- name: Login to Gitea
id: docker-hub-login
uses: docker/login-action@v2
with:
registry: git.sporq.de
username: ${{ secrets.GITEA_USERNAME }}
password: ${{ secrets.GITEA_TOKEN }}
- name: Release (pull candidate, tag, push) - name: Release (pull candidate, tag, push)
env: env:
DHNS: ${{ env.docker-hub-namespace }} DHNS: ${{ env.docker-hub-namespace }}
@ -672,13 +648,6 @@ jobs:
with: with:
username: ${{ secrets.DOCKER_HUB_USERNAME }} username: ${{ secrets.DOCKER_HUB_USERNAME }}
password: ${{ secrets.DOCKER_HUB_TOKEN }} password: ${{ secrets.DOCKER_HUB_TOKEN }}
- name: Login to Gitea
id: docker-hub-login
uses: docker/login-action@v2
with:
registry: git.sporq.de
username: ${{ secrets.GITEA_USERNAME }}
password: ${{ secrets.GITEA_TOKEN }}
- name: Release (pull candidate, tag, push) - name: Release (pull candidate, tag, push)
env: env:
DHNS: ${{ env.docker-hub-namespace }} DHNS: ${{ env.docker-hub-namespace }}

View File

@ -1,4 +1,4 @@
FROM debian:bookworm AS common FROM ubuntu:focal-20220113 AS common
CMD ["/bin/bash"] CMD ["/bin/bash"]