diff --git a/.gitea/workflows/build_helm_chart_push.yml b/.gitea/workflows/build_helm_chart_push.yml index 5d27457..1095970 100644 --- a/.gitea/workflows/build_helm_chart_push.yml +++ b/.gitea/workflows/build_helm_chart_push.yml @@ -21,7 +21,7 @@ jobs: - name: Show Information run: echo "Runner ${{ runner.os }} working on repository ${{ gitea.repository }} and on tag ${{ gitea.ref_name }}" - name: clone repo helm chart - run: git clone https://${{ secrets.REGISTRY_DOCKER_PASS }}@${{ vars.REGISTRY_DOCKER }}/${{ secrets.REGISTRY_DOCKER_USER }}/${{ env.GIT_REPO }} + run: git clone https://${{ secrets.PACKAGE_RW }}@${{ vars.REGISTRY_DOCKER }}/${{ secrets.GIT_USER_REPO }}/${{ env.GIT_REPO }} - name: tag release run: | export VERSION=$(echo "${{ gitea.ref_name }}" | cut -d '-' -f 1) @@ -31,4 +31,4 @@ jobs: - name: push repo run: | export VERSION=$(echo "${{ gitea.ref_name }}" | cut -d '-' -f 1) - curl --user ${{ secrets.REGISTRY_DOCKER_USER }}:${{ secrets.REGISTRY_DOCKER_PASS }} -X POST --upload-file /workspace/${{ secrets.GIT_USER_REPO }}/gitea-runner/${{ env.GIT_REPO }}-$VERSION.tgz https://${{ vars.REGISTRY_DOCKER }}/api/packages/${{ secrets.GIT_USER_REPO }}/helm/api/charts + curl --user ${{ secrets.GIT_USER_REPO }}:${{ secrets.PACKAGE_RW }} -X POST --upload-file /workspace/${{ secrets.GIT_USER_REPO }}/gitea-runner/${{ env.GIT_REPO }}-$VERSION.tgz https://${{ vars.REGISTRY_DOCKER }}/api/packages/${{ secrets.GIT_USER_REPO }}/helm/api/charts diff --git a/.gitea/workflows/build_push_internal_docker.yml b/.gitea/workflows/build_push_internal_docker.yml index 226d1ef..4c91421 100644 --- a/.gitea/workflows/build_push_internal_docker.yml +++ b/.gitea/workflows/build_push_internal_docker.yml @@ -32,12 +32,12 @@ jobs: run: echo "Runner ${{ runner.os }} working on repository ${{ gitea.repository }} and on tag ${{ gitea.ref_name }}" - name: clone & build run: | - git clone https://${{ secrets.REGISTRY_DOCKER_PASS }}@${{ vars.REGISTRY_DOCKER }}/${{ secrets.REGISTRY_DOCKER_USER }}/${{ env.GIT_REPO }} + git clone https://${{ secrets.REGISTRY_DOCKER_PASS }}@${{ vars.REGISTRY_DOCKER }}/${{ secrets.GIT_USER_REPO }}/${{ env.GIT_REPO }} cd ${{ env.GIT_REPO }} docker buildx b . -t ${{ env.DOCKER_IMAGE_NAME }} - name: login & push run: | - echo "${{ secrets.REGISTRY_DOCKER_PASS }}" | docker login -u ${{ secrets.REGISTRY_DOCKER_USER }} --password-stdin ${{ vars.REGISTRY_DOCKER }} + echo "${{ secrets.PACKAGE_RW }}" | docker login -u ${{ secrets.GIT_USER_REPO }} --password-stdin ${{ vars.REGISTRY_DOCKER }} export VERSION=$(echo "${{ gitea.ref_name }}" | cut -d '-' -f 1) docker tag ${{ env.DOCKER_IMAGE_NAME }} ${{ vars.REGISTRY_DOCKER }}/${{ secrets.GIT_USER_REPO }}/${{ env.DOCKER_IMAGE_NAME }}:$VERSION docker tag ${{ env.DOCKER_IMAGE_NAME }} ${{ vars.REGISTRY_DOCKER }}/${{ secrets.GIT_USER_REPO }}/${{ env.DOCKER_IMAGE_NAME }}:latest diff --git a/.gitea/workflows/build_push_internal_docker_poker.yml b/.gitea/workflows/build_push_internal_docker_poker.yml index 1c27e45..2d9d2ed 100644 --- a/.gitea/workflows/build_push_internal_docker_poker.yml +++ b/.gitea/workflows/build_push_internal_docker_poker.yml @@ -24,7 +24,7 @@ jobs: # image: ${{ vars.REGISTRY_DOCKER }}/${{ vars.DOCKER_IMAGE_RUNNER }}:latest # credentials: # username: ${{ secrets.GIT_USER_REPO }} - # password: ${{ secrets.REGISTRY_DOCKER_PASS }} + # password: ${{ secrets.PACKAGE_RW }} steps: @@ -32,7 +32,7 @@ jobs: run: echo "Runner ${{ runner.os }} working on repository ${{ gitea.repository }} and on tag ${{ gitea.ref_name }}" - name: clone & build run: | - git clone https://${{ secrets.REGISTRY_DOCKER_PASS }}@${{ vars.REGISTRY_DOCKER }}/${{ secrets.REGISTRY_DOCKER_USER }}/${{ env.GIT_REPO }} + git clone https://${{ secrets.PACKAGE_RW }}@${{ vars.REGISTRY_DOCKER }}/${{ secrets.GIT_USER_REPO }}/${{ env.GIT_REPO }} cd ${{ env.GIT_REPO }} pwd echo "sed -i "s/^FROM .*/FROM node:18/" /workspace/${{ secrets.GIT_USER_REPO }}/gitea-runner/${{ env.GIT_REPO }}/Dockerfile" @@ -41,7 +41,7 @@ jobs: docker buildx b . -t ${{ env.DOCKER_IMAGE_NAME }} - name: login & push run: | - echo "${{ secrets.REGISTRY_DOCKER_PASS }}" | docker login -u ${{ secrets.REGISTRY_DOCKER_USER }} --password-stdin ${{ vars.REGISTRY_DOCKER }} + echo "${{ secrets.PACKAGE_RW }}" | docker login -u ${{ secrets.GIT_USER_REPO }} --password-stdin ${{ vars.REGISTRY_DOCKER }} export VERSION=$(echo "${{ gitea.ref_name }}" | cut -d '-' -f 1) docker tag ${{ env.DOCKER_IMAGE_NAME }} ${{ vars.REGISTRY_DOCKER }}/${{ secrets.GIT_USER_REPO }}/${{ env.DOCKER_IMAGE_NAME }}:$VERSION docker tag ${{ env.DOCKER_IMAGE_NAME }} ${{ vars.REGISTRY_DOCKER }}/${{ secrets.GIT_USER_REPO }}/${{ env.DOCKER_IMAGE_NAME }}:latest @@ -65,7 +65,7 @@ jobs: # with: # registry: ${{ vars.REGISTRY_DOCKER }} # username: ${{ secrets.GIT_USER_REPO }} - # password: ${{ secrets.REGISTRY_DOCKER_PASS }} + # password: ${{ secrets.PACKAGE_RW }} # - run: git --help diff --git a/.gitea/workflows/build_push_internal_docker_spiderfoot.yml b/.gitea/workflows/build_push_internal_docker_spiderfoot.yml index 6df4c8e..30f23b1 100644 --- a/.gitea/workflows/build_push_internal_docker_spiderfoot.yml +++ b/.gitea/workflows/build_push_internal_docker_spiderfoot.yml @@ -24,7 +24,7 @@ jobs: # image: ${{ vars.REGISTRY_DOCKER }}/${{ vars.DOCKER_IMAGE_RUNNER }}:latest # credentials: # username: ${{ secrets.GIT_USER_REPO }} - # password: ${{ secrets.REGISTRY_DOCKER_PASS }} + # password: ${{ secrets.PACKAGE_RW }} steps: @@ -32,13 +32,13 @@ jobs: run: echo "Runner ${{ runner.os }} working on repository ${{ gitea.repository }} and on tag ${{ gitea.ref_name }}" - name: clone & build run: | - git clone https://${{ secrets.REGISTRY_DOCKER_PASS }}@${{ vars.REGISTRY_DOCKER }}/${{ secrets.REGISTRY_DOCKER_USER }}/${{ env.GIT_REPO }} + git clone https://${{ secrets.PACKAGE_RW }}@${{ vars.REGISTRY_DOCKER }}/${{ secrets.GIT_USER_REPO }}/${{ env.GIT_REPO }} cd ${{ env.GIT_REPO }} cat /workspace/${{ secrets.GIT_USER_REPO }}/gitea-runner/${{ env.GIT_REPO }}/Dockerfile docker buildx b . -t ${{ env.DOCKER_IMAGE_NAME }} - name: login & push run: | - echo "${{ secrets.REGISTRY_DOCKER_PASS }}" | docker login -u ${{ secrets.REGISTRY_DOCKER_USER }} --password-stdin ${{ vars.REGISTRY_DOCKER }} + echo "${{ secrets.PACKAGE_RW }}" | docker login -u ${{ secrets.GIT_USER_REPO }} --password-stdin ${{ vars.REGISTRY_DOCKER }} export VERSION=$(echo "${{ gitea.ref_name }}" | cut -d '-' -f 1) docker tag ${{ env.DOCKER_IMAGE_NAME }} ${{ vars.REGISTRY_DOCKER }}/${{ secrets.GIT_USER_REPO }}/${{ env.DOCKER_IMAGE_NAME }}:$VERSION docker tag ${{ env.DOCKER_IMAGE_NAME }} ${{ vars.REGISTRY_DOCKER }}/${{ secrets.GIT_USER_REPO }}/${{ env.DOCKER_IMAGE_NAME }}:latest diff --git a/.gitea/workflows/build_push_package_deb.yml b/.gitea/workflows/build_push_package_deb.yml index d457ee1..b3e0fa5 100644 --- a/.gitea/workflows/build_push_package_deb.yml +++ b/.gitea/workflows/build_push_package_deb.yml @@ -47,9 +47,9 @@ jobs: - name: Push packages run: | - curl --user ${{ secrets.REGISTRY_DOCKER_USER }}:${{ secrets.PACKAGE_PUSH_REPO }} \ + curl --user ${{ secrets.GIT_USER_REPO }}:${{ secrets.PACKAGE_RW }} \ --upload-file ${{ env.PACKAGE_NAME }}_${{ gitea.ref_name }}_${{ env.ARCH }}.deb \ - https://${{ env.GIT_REPO_URL }}/api/packages/${{ secrets.REGISTRY_DOCKER_USER }}/debian/pool/${{ env.DEB_OS_TARGET }}/main/upload + https://${{ env.GIT_REPO_URL }}/api/packages/${{ secrets.GIT_USER_REPO }}/debian/pool/${{ env.DEB_OS_TARGET }}/main/upload - name: Output - run: echo "Runner push on ${{ env.GIT_REPO_URL }} with user ${{ secrets.REGISTRY_DOCKER_USER }} package ${{ env.PACKAGE_NAME }} os ${{ env.DEB_OS_TARGET }} tag ${{ gitea.ref_name }}" \ No newline at end of file + run: echo "Runner push on ${{ env.GIT_REPO_URL }} with user ${{ secrets.GIT_USER_REPO }} package ${{ env.PACKAGE_NAME }} os ${{ env.DEB_OS_TARGET }} tag ${{ gitea.ref_name }}" \ No newline at end of file diff --git a/.gitea/workflows/build_push_public_docker.yml b/.gitea/workflows/build_push_public_docker.yml index 7b1d4f6..2b54610 100644 --- a/.gitea/workflows/build_push_public_docker.yml +++ b/.gitea/workflows/build_push_public_docker.yml @@ -32,7 +32,7 @@ jobs: docker buildx b . -t ${{ env.GIT_REPO }} - name: login & push run: | - echo "${{ secrets.REGISTRY_DOCKER_PASS }}" | docker login -u ${{ secrets.REGISTRY_DOCKER_USER }} --password-stdin ${{ vars.REGISTRY_DOCKER }} + echo "${{ secrets.PACKAGE_RW }}" | docker login -u ${{ secrets.GIT_USER_REPO }} --password-stdin ${{ vars.REGISTRY_DOCKER }} export VERSION=$(echo "${{ gitea.ref_name }}" | cut -d '-' -f 1) docker tag ${{ env.GIT_REPO }} ${{ vars.REGISTRY_DOCKER }}/${{ secrets.GIT_USER_REPO }}/${{ env.GIT_REPO }}:$VERSION docker tag ${{ env.GIT_REPO }} ${{ vars.REGISTRY_DOCKER }}/${{ secrets.GIT_USER_REPO }}/${{ env.GIT_REPO }}:latest