diff --git a/.gitea/workflows/demo.yaml b/.gitea/workflows/demo.yaml index e5ae7c9..36afacd 100644 --- a/.gitea/workflows/demo.yaml +++ b/.gitea/workflows/demo.yaml @@ -21,19 +21,19 @@ jobs: - name: Configure Docker CLI for insecure registry run: | mkdir -p ~/.docker - echo '{"insecure-registries" : ["git.rustprogersteam.ru"]}' > ~/.docker/config.json + echo '{"insecure-registries" : ["git.srcoder.moe"]}' > ~/.docker/config.json cat ~/.docker/config.json - name: 'Docker Tags' id: tags uses: https://github.com/cssnr/docker-tags-action@v2 with: - images: 'git.rustprogersteam.ru/${{ vars.DOCKER_USERNAME }}/myresume' + images: 'git.srcoder.moe/${{ vars.DOCKER_USERNAME }}/srcoder.moe' - name: Login to Docker Registry uses: docker/login-action@v3 with: - registry: git.rustprogersteam.ru + registry: git.srcoder.moe username: ${{ vars.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} @@ -46,8 +46,8 @@ jobs: context: . push: true tags: | - git.rustprogersteam.ru/${{ vars.DOCKER_USERNAME }}/myresume/resume:latest - git.rustprogersteam.ru/${{ vars.DOCKER_USERNAME }}/myresume/resume:${{ github.sha }} + git.srcoder.moe/${{ vars.DOCKER_USERNAME }}/srcoder.moe/site:latest + git.srcoder.moe/${{ vars.DOCKER_USERNAME }}/srcoder.moe/site:${{ github.sha }} labels: ${{ steps.tags.outputs.labels }} cache-from: type=gha cache-to: type=gha,mode=max @@ -70,7 +70,7 @@ jobs: SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} run: | mkdir -p ~/.ssh - printf '%s\n' "$SSH_PRIVATE_KEY" > ~/.ssh/deploy_key + printf '%s' "$SSH_PRIVATE_KEY" | tr -d '\r' > ~/.ssh/deploy_key chmod 600 ~/.ssh/deploy_key ssh-keygen -y -f ~/.ssh/deploy_key >/dev/null diff --git a/ansible/restart_compose.yml b/ansible/restart_compose.yml index 6264467..45360e1 100644 --- a/ansible/restart_compose.yml +++ b/ansible/restart_compose.yml @@ -5,11 +5,11 @@ - name: docker compose down ansible.builtin.shell: cmd: docker compose down - chdir: /etc/compose/resume + chdir: /etc/compose/srcoder.moe - name: prune system ansible.builtin.shell: cmd: docker system prune -a -f - name: docker compose up -d ansible.builtin.shell: cmd: docker compose up -d - chdir: /etc/compose/resume + chdir: /etc/compose/srcoder.moe