From 5ff99e39e2fa6972c671287d0057c3c574dd93b3 Mon Sep 17 00:00:00 2001 From: nohoster Date: Sat, 24 Feb 2024 16:48:31 -0600 Subject: [PATCH] Change config to redlib-org account --- .github/workflows/build-artifacts.yaml | 8 ++++++- .github/workflows/main-docker.yml | 30 +++++++++++++------------- Dockerfile | 2 +- 3 files changed, 23 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build-artifacts.yaml b/.github/workflows/build-artifacts.yaml index 7b671a63..da7330be 100644 --- a/.github/workflows/build-artifacts.yaml +++ b/.github/workflows/build-artifacts.yaml @@ -47,11 +47,17 @@ jobs: run: | sudo apt update sudo apt install -y gcc-aarch64-linux-gnu musl-tools - + + # Using DATE-TIME for release name - name: Date id: date run: echo "DATE=$(date +%Y%m%d-%H%M)" >> "$GITHUB_OUTPUT" + # In case app version is prefered + # - name: Versions + # id: version + # run: echo "VERSION=$(cargo metadata --format-version 1 --no-deps | jq .packages[0].version -r | sed 's/^/v/')" >> "$GITHUB_OUTPUT" + - name: Build run: cargo build --release --target ${{ matrix.target }} diff --git a/.github/workflows/main-docker.yml b/.github/workflows/main-docker.yml index e51dc4b6..520269c7 100644 --- a/.github/workflows/main-docker.yml +++ b/.github/workflows/main-docker.yml @@ -6,7 +6,7 @@ on: types: - completed env: - REGISTRY_IMAGE: ghcr.io/nohoster/redlib + REGISTRY_IMAGE: quay.io/redlib/redlib jobs: build: @@ -21,11 +21,11 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Docker meta id: meta - uses: docker/metadata-action@v4 + uses: docker/metadata-action@v5 with: images: ${{ env.REGISTRY_IMAGE }} tags: | @@ -33,21 +33,21 @@ jobs: type=raw,value=latest,enable={{is_default_branch}} - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Login to GitHub Container Registry - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} + registry: quay.io + username: ${{ secrets.QUAY_USERNAME }} + password: ${{ secrets.QUAY_ROBOT_TOKEN }} - name: Build and push id: build - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v5 with: context: . platforms: ${{ matrix.platform }} @@ -82,11 +82,11 @@ jobs: path: /tmp/digests - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Docker meta id: meta - uses: docker/metadata-action@v4 + uses: docker/metadata-action@v5 with: images: ${{ env.REGISTRY_IMAGE }} tags: | @@ -94,11 +94,11 @@ jobs: type=raw,value=latest,enable={{is_default_branch}} - name: Login to GitHub Container Registry - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} + username: ${{ secrets.QUAY_USERNAME }} + password: ${{ secrets.QUAY_ROBOT_TOKEN }} - name: Create manifest list and push working-directory: /tmp/digests diff --git a/Dockerfile b/Dockerfile index 034f5548..94125658 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ ARG TARGET RUN apk add --no-cache curl -RUN curl -L https://github.com/nohoster/redlib/releases/latest/download/redlib-${TARGET}.tar.gz | \ +RUN curl -L https://github.com/redlib-org/redlib/releases/latest/download/redlib-${TARGET}.tar.gz | \ tar xz -C /usr/local/bin/ RUN adduser --home /nonexistent --no-create-home --disabled-password redlib