diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index f6fa90e..05804d1 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -38,26 +38,22 @@ jobs: uses: actions/checkout@v4 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + run: | + docker buildx create --use || true + docker buildx inspect --bootstrap - name: Login to Registry - uses: docker/login-action@v3 - with: - registry: ${{ secrets.REGISTRY_HOSTPORT }} - username: ${{ secrets.REGISTRY_USERNAME }} - password: ${{ secrets.REGISTRY_PASSWORD }} + run: | + docker login ${{ secrets.REGISTRY_HOSTPORT }} -u ${{ secrets.REGISTRY_USERNAME }} -p ${{ secrets.REGISTRY_PASSWORD }} - name: Build and push - uses: docker/build-push-action@v5 - with: - context: . - push: true - tags: | - ${{ secrets.REGISTRY_HOSTPORT }}/nxtgauge-rust-${{ matrix.service }}:${{ gitea.sha }} - ${{ secrets.REGISTRY_HOSTPORT }}/nxtgauge-rust-${{ matrix.service }}:${{ gitea.ref }}-latest - file: Dockerfile.simple - build-args: | - SERVICE_NAME=${{ matrix.service }} + run: | + docker buildx build --push \ + -f Dockerfile.simple \ + --build-arg SERVICE_NAME=${{ matrix.service }} \ + -t "${{ secrets.REGISTRY_HOSTPORT }}/nxtgauge-rust-${{ matrix.service }}:${{ gitea.sha }}" \ + -t "${{ secrets.REGISTRY_HOSTPORT }}/nxtgauge-rust-${{ matrix.service }}:${{ gitea.ref }}-latest" \ + . migrate: runs-on: ubuntu-latest @@ -66,21 +62,18 @@ jobs: uses: actions/checkout@v4 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + run: | + docker buildx create --use || true + docker buildx inspect --bootstrap - name: Login to Registry - uses: docker/login-action@v3 - with: - registry: ${{ secrets.REGISTRY_HOSTPORT }} - username: ${{ secrets.REGISTRY_USERNAME }} - password: ${{ secrets.REGISTRY_PASSWORD }} + run: | + docker login ${{ secrets.REGISTRY_HOSTPORT }} -u ${{ secrets.REGISTRY_USERNAME }} -p ${{ secrets.REGISTRY_PASSWORD }} - name: Build and push migrate - uses: docker/build-push-action@v5 - with: - context: . - push: true - tags: | - ${{ secrets.REGISTRY_HOSTPORT }}/nxtgauge-db-migrate:${{ gitea.sha }} - ${{ secrets.REGISTRY_HOSTPORT }}/nxtgauge-db-migrate:${{ gitea.ref }}-latest - file: Dockerfile.migrate + run: | + docker buildx build --push \ + -f Dockerfile.migrate \ + -t "${{ secrets.REGISTRY_HOSTPORT }}/nxtgauge-db-migrate:${{ gitea.sha }}" \ + -t "${{ secrets.REGISTRY_HOSTPORT }}/nxtgauge-db-migrate:${{ gitea.ref }}-latest" \ + .