diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 60a6738..641f7d3 100755 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -2,21 +2,13 @@ name: Deploy run-name: build and deploy app to server. on: [push] jobs: - PullDocker: - runs-on: [ubuntu-latest, ubuntu-24.04] - steps: - - name: Login to ACR - uses: aliyun/acr-login@v1 - with: - login-server: https://registry.cn-shenzhen.aliyuncs.com - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - name: Pull Docker image - run: docker pull registry.cn-shenzhen.aliyuncs.com/amass_toolset/ubuntu_dev:22.04 Build: runs-on: [ubuntu-latest, ubuntu-24.04] container: image: registry.cn-shenzhen.aliyuncs.com/amass_toolset/ubuntu_dev:22.04 + credentials: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} steps: - name: Set up SSH run: | diff --git a/.gitea/workflows/docker.yaml b/.gitea/workflows/docker.yaml index c2b13a8..1524a96 100644 --- a/.gitea/workflows/docker.yaml +++ b/.gitea/workflows/docker.yaml @@ -2,7 +2,7 @@ name: Deploy Docker Images run-name: build and deploy docker image to server. on: [push] jobs: - Docusaurus build and Server deploy: + Build dockerfile and Server deploy: runs-on: ubuntu-latest steps: - name: Set up SSH