diff --git a/.gitea/workflows/builder.yaml b/.gitea/workflows/builder.yaml index 1a5e7c1..5abab8a 100644 --- a/.gitea/workflows/builder.yaml +++ b/.gitea/workflows/builder.yaml @@ -15,20 +15,3 @@ jobs: uses: actions/checkout@v3 - name: Start shell build run: CONTAINER_TOKEN=${{ secrets.CONTAINER_TOKEN }} ./build.sh - - name: Generate tag - id: tag_vars - run: echo "IMAGE_NAME=$(echo $GITHUB_SERVER_URL/$GITHUB_REPOSITORY | tr '[:upper:]' '[:lower:]' | cut -d '/' -f3-)" >> $GITHUB_OUTPUT - - name: Login to register - uses: https://gitea.com/docker/login-action@v2 - with: - registry: https://git.halis.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - name: Build and push - uses: https://github.com/docker/build-push-action@v1 - with: - push: true - file: images/debian/Dockerfile.12.1-node18 - tags: git.halis.io/athens-school/runner-images:debian12.1-node18 - - diff --git a/build.sh b/build.sh index f5d545b..858b4b3 100755 --- a/build.sh +++ b/build.sh @@ -1,7 +1,8 @@ #!/bin/sh -export echo $CONTAINER_TOKEN | docker login git.halis.io -u $GITHUB_ACTOR --password-stdin +IMAGE_NAME=$(echo $GITHUB_SERVER_URL/$GITHUB_REPOSITORY | tr '[:upper:]' '[:lower:]' | cut -d '/' -f3-) + docker pull ubuntu:latest -docker tag ubuntu:latest git.halis.io/athens-school/runner-images:shell-build -docker push git.halis.io/athens-school/runner-images:shell-build +docker tag ubuntu:latest $IMAGE_NAME:shell-auto-build +docker push $IMAGE_NAME:shell-auto-build