diff --git a/.gitea/workflows/build_push_internal_docker_poker.yml b/.gitea/workflows/build_push_internal_docker_poker.yml index 2d9d2ed..c43608b 100644 --- a/.gitea/workflows/build_push_internal_docker_poker.yml +++ b/.gitea/workflows/build_push_internal_docker_poker.yml @@ -23,7 +23,7 @@ jobs: # container: # image: ${{ vars.REGISTRY_DOCKER }}/${{ vars.DOCKER_IMAGE_RUNNER }}:latest # credentials: - # username: ${{ secrets.GIT_USER_REPO }} + # username: ${{ vars.GIT_USER_REPO }} # password: ${{ secrets.PACKAGE_RW }} @@ -32,22 +32,22 @@ 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.PACKAGE_RW }}@${{ vars.REGISTRY_DOCKER }}/${{ secrets.GIT_USER_REPO }}/${{ env.GIT_REPO }} + git clone https://${{ secrets.PACKAGE_RW }}@${{ vars.REGISTRY_DOCKER }}/${{ vars.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" - sed -i "s/^FROM .*/FROM node:18/" /workspace/${{ secrets.GIT_USER_REPO }}/gitea-runner/${{ env.GIT_REPO }}/Dockerfile - cat /workspace/${{ secrets.GIT_USER_REPO }}/gitea-runner/${{ env.GIT_REPO }}/Dockerfile + echo "sed -i "s/^FROM .*/FROM node:18/" /workspace/${{ vars.GIT_USER_REPO }}/gitea-runner/${{ env.GIT_REPO }}/Dockerfile" + sed -i "s/^FROM .*/FROM node:18/" /workspace/${{ vars.GIT_USER_REPO }}/gitea-runner/${{ env.GIT_REPO }}/Dockerfile + cat /workspace/${{ vars.GIT_USER_REPO }}/gitea-runner/${{ env.GIT_REPO }}/Dockerfile docker buildx b . -t ${{ env.DOCKER_IMAGE_NAME }} - name: login & push run: | - echo "${{ secrets.PACKAGE_RW }}" | docker login -u ${{ secrets.GIT_USER_REPO }} --password-stdin ${{ vars.REGISTRY_DOCKER }} + echo "${{ secrets.PACKAGE_RW }}" | docker login -u ${{ vars.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 - echo "docker push ${{ vars.REGISTRY_DOCKER }}/${{ secrets.GIT_USER_REPO }}/${{ env.DOCKER_IMAGE_NAME }}:$VERSION" - docker push ${{ vars.REGISTRY_DOCKER }}/${{ secrets.GIT_USER_REPO }}/${{ env.DOCKER_IMAGE_NAME }}:$VERSION - docker push ${{ vars.REGISTRY_DOCKER }}/${{ secrets.GIT_USER_REPO }}/${{ env.DOCKER_IMAGE_NAME }}:latest + docker tag ${{ env.DOCKER_IMAGE_NAME }} ${{ vars.REGISTRY_DOCKER }}/${{ vars.GIT_USER_REPO }}/${{ env.DOCKER_IMAGE_NAME }}:$VERSION + docker tag ${{ env.DOCKER_IMAGE_NAME }} ${{ vars.REGISTRY_DOCKER }}/${{ vars.GIT_USER_REPO }}/${{ env.DOCKER_IMAGE_NAME }}:latest + echo "docker push ${{ vars.REGISTRY_DOCKER }}/${{ vars.GIT_USER_REPO }}/${{ env.DOCKER_IMAGE_NAME }}:$VERSION" + docker push ${{ vars.REGISTRY_DOCKER }}/${{ vars.GIT_USER_REPO }}/${{ env.DOCKER_IMAGE_NAME }}:$VERSION + docker push ${{ vars.REGISTRY_DOCKER }}/${{ vars.GIT_USER_REPO }}/${{ env.DOCKER_IMAGE_NAME }}:latest # docker pull gitea.jingoh.fr/staffadmin/test:0.0.1 # docker tag gitea.jingoh.fr/staffadmin/test:0.0.1 gitea.jingoh.fr/staffadmin/toto:latest @@ -64,7 +64,7 @@ jobs: # uses: docker/login-action@v3 # with: # registry: ${{ vars.REGISTRY_DOCKER }} - # username: ${{ secrets.GIT_USER_REPO }} + # username: ${{ vars.GIT_USER_REPO }} # password: ${{ secrets.PACKAGE_RW }}