diff --git a/.gitea/workflows/docker_build.yml b/.gitea/workflows/docker_build.yml index 822fa73..6ba3f44 100644 --- a/.gitea/workflows/docker_build.yml +++ b/.gitea/workflows/docker_build.yml @@ -22,7 +22,12 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - - run: ./update_dockerhub_api ${{ gitea.repository }} ${{ secrets.DOCKERHUB_PASSWORD }} ${{ secrets.API_KEY }} + - run: | + ./update_dockerhub_api \ + ${{ secrets.DOCKERHUB_USERNAME }} \ + ${{ secrets.DOCKERHUB_PASSWORD }} \ + ${{ gitea.repository }} \ + ${{ secrets.API_KEY }} - name: Log in to Docker Hub uses: docker/login-action@v3 diff --git a/lorem_ipsum b/lorem_ipsum deleted file mode 100644 index e69de29..0000000 diff --git a/update_dockerhub_api b/update_dockerhub_api index 9abbdbe..d6d6245 100755 --- a/update_dockerhub_api +++ b/update_dockerhub_api @@ -1,32 +1,24 @@ #!/bin/bash -GITEA_OWNER_REPO="${1}" +DOCKERHUB_USERNAME="${1}" DOCKERHUB_PASSWORD="${2}" -GITEA_API_KEY="${3}" -docker_username=pizza2da1 +GITEA_OWNER_REPO="${3}" +GITEA_API_KEY="${4}" gitea_username=$(echo "${GITEA_OWNER_REPO}" | sed 's/\/.*//') repo_name=$(echo "${GITEA_OWNER_REPO}" | sed 's/^.*\///') -#gitea_username=pizza2d1 -#repo_name=better_ripper - -TOKEN=$(curl -s -X POST "https://hub.docker.com/v2/auth/token" \ +NEW_DOCKERHUB_TOKEN=$(curl -s -X POST "https://hub.docker.com/v2/auth/token" \ -H "Content-Type: application/json" \ - -d "{\"identifier\": \"${docker_username}\", \"secret\": \"${DOCKERHUB_PASSWORD}\"}" \ + -d "{\"identifier\": \"${DOCKERHUB_USERNAME}\", \"secret\": \"${DOCKERHUB_PASSWORD}\"}" \ | jq -r .access_token) -echo -echo $TOKEN -echo ${gitea_username} -echo ${repo_name} - curl -X 'PUT' \ "https://gitea.happylizard.me/api/v1/repos/${gitea_username}/${repo_name}/actions/secrets/DOCKERHUB_TOKEN" \ -H 'accept: application/json' \ -H "Authorization: token ${GITEA_API_KEY}" \ -H 'Content-Type: application/json' \ -d "{ - \"data\": \"${TOKEN}\", + \"data\": \"${NEW_DOCKERHUB_TOKEN}\", \"description\": \"\" }"