From 3e6c14f7cbb09f5d250b65133c3796ddeaed3cbe Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Thu, 5 Jan 2023 15:43:25 +0700 Subject: [PATCH] Make docker pull prebuilts for multiple archs --- .github/workflows/build.yml | 102 +++++++++++++++++++++++++++++++++++ .github/workflows/docker.yml | 40 -------------- Dockerfile | 26 +++++++-- 3 files changed, 125 insertions(+), 43 deletions(-) delete mode 100644 .github/workflows/docker.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1802f1f..ec154fe 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -133,6 +133,108 @@ jobs: name: release-${{ matrix.arch }}-buster path: "target/${{ matrix.target }}/release/neolink*" + push_to_registry: + name: Build Docker image + # if: ${{ github.event_name }} == 'push' + runs-on: ubuntu-latest + needs: + - "cross" + - "native" + steps: + - name: Check token is set + id: vars + shell: bash + run: | + unset HAS_SECRET + if [ -n $SECRET ]; then HAS_SECRET='true' ; fi + echo "HAS_SECRET_TOKEN=${HAS_SECRET}" >> $GITHUB_OUTPUT + env: + SECRET: "${{ secrets.DOCKER_TOKEN }}" + - name: Check out the repo + uses: actions/checkout@v3 + if: ${{ steps.vars.outputs.HAS_SECRET_TOKEN }} + - name: Convert username to lower case for docker + id: string_user + uses: ASzc/change-string-case-action@v5 + with: + string: ${{ github.repository_owner }} + - name: Convert repo to lower case for docker + id: string_repo + uses: ASzc/change-string-case-action@v5 + with: + string: ${{ github.repository }} + - name: Set up QEMU + if: ${{ steps.vars.outputs.HAS_SECRET_TOKEN }} + uses: docker/setup-qemu-action@v2 + - name: Set up Docker Buildx + if: ${{ steps.vars.outputs.HAS_SECRET_TOKEN }} + uses: docker/setup-buildx-action@v2 + - name: Login to Docker Hub + if: ${{ steps.vars.outputs.HAS_SECRET_TOKEN }} + uses: docker/login-action@v2 + with: + registry: docker.io + username: ${{ steps.string_user.outputs.lowercase }} + password: ${{ secrets.DOCKER_TOKEN }} + - name: Get tag name + if: ${{ steps.vars.outputs.HAS_SECRET_TOKEN }} + id: tags + run: | + branch="${GITHUB_REF#refs/heads/}" + tags="${REPO_NAME}:${branch}" + if [ "${branch}" == "master" ]; then + tags="${tags},${REPO_NAME}:latest" + fi + echo "TAGS=${tags}" >> $GITHUB_OUTPUT + env: + REPO_NAME: ${{ steps.string_repo.outputs.lowercase }} + - name: Install latest rust + run: | + rustup toolchain install stable + - name: Install toml-cli + run: | + cargo install toml-cli + - name: Get project version + id: toml + run: | + NEOLINK_VERSION="$(toml get Cargo.toml package.version | sed 's|"||g')" + echo "version=${NEOLINK_VERSION}" >> $GITHUB_OUTPUT + - name: Prepare directory + run: | + mkdir linux + mkdir linux/arm + - name: Download Linux x86_64 + uses: actions/download-artifact@v3 + with: + name: release-ubuntu-22.04 + path: linux/amd64 + - name: Download Linux armv7 + uses: actions/download-artifact@v3 + with: + name: release-armhf-buster + path: linux/arm/v7 + - name: Download Linux arm64 + uses: actions/download-artifact@v3 + with: + name: release-arm64-buster + path: linux/arm64 + - name: Download Linux i386 + uses: actions/download-artifact@v3 + with: + name: release-i386-buster + path: linux/386 + - name: Push to Docker Hub + if: ${{ steps.vars.outputs.HAS_SECRET_TOKEN }} + uses: docker/build-push-action@v3 + with: + platforms: linux/amd64,linux/arm/v7,linux/arm/v6,linux/arm64 + push: true + file: Dockerfile + tags: ${{ steps.tags.outputs.TAGS }} + build-args: VERSION=${{ steps.toml.outputs.version }}, REPO=${{ github.repository }}, OWNER=${{ github.repository_owner }} + env: + DOCKER_BUILDKIT: 1 + create_release: name: Create Release runs-on: ubuntu-latest diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml deleted file mode 100644 index 5adc5d9..0000000 --- a/.github/workflows/docker.yml +++ /dev/null @@ -1,40 +0,0 @@ -# A single-shot build-n-pack on Alpine Linux -name: Publish Docker image -on: [push] - -jobs: - push_to_registry: - name: Build Docker image - runs-on: ubuntu-latest - steps: - - name: Check token is set - id: vars - shell: bash - run: | - unset HAS_SECRET - if [ -n $SECRET ]; then HAS_SECRET='true' ; fi - echo "HAS_SECRET_TOKEN=${HAS_SECRET}" >> $GITHUB_OUTPUT - env: - SECRET: "${{ secrets.DOCKER_TOKEN }}" - - name: Check out the repo - uses: actions/checkout@v3 - if: ${{ steps.vars.outputs.HAS_SECRET_TOKEN }} - - name: Convert username to lower case for docker - id: string_user - uses: ASzc/change-string-case-action@v1 - with: - string: ${{ github.repository_owner }} - - name: Convert repo to lower case for docker - id: string_repo - uses: ASzc/change-string-case-action@v1 - with: - string: ${{ github.repository }} - - name: Push to Docker Hub - uses: docker/build-push-action@v1 - if: ${{ steps.vars.outputs.HAS_SECRET_TOKEN }} - with: - username: ${{ steps.string_user.outputs.lowercase }} - password: ${{ secrets.DOCKER_TOKEN }} - registry: docker.io - repository: ${{ steps.string_repo.outputs.lowercase }} - tag_with_ref: true diff --git a/Dockerfile b/Dockerfile index e45cbed..c99ec15 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,9 +5,10 @@ # SPDX-License-Identifier: AGPL-3.0-only FROM docker.io/rust:slim-buster AS build -LABEL authours="George Hilliard " +ARG TARGETPLATFORM ENV DEBIAN_FRONTEND=noninteractive +# hadolint ignore=DL3008 RUN apt-get update && \ apt-get install -y --no-install-recommends \ build-essential \ @@ -19,13 +20,32 @@ RUN apt-get update && \ WORKDIR /usr/local/src/neolink -# Build the main program +# Build the main program or copy from github build ones COPY . /usr/local/src/neolink -RUN cargo build --release +RUN if [ -f "${TARGETPLATFORM}/neolink" ]; then \ + mkdir -p /usr/local/src/neolink/target/release/; \ + cp "${TARGETPLATFORM}/neolink" "/usr/local/src/neolink/target/release/neolink"; \ + else \ + cargo build --release; \ + fi + +# Check it works +RUN chmod +x "/usr/local/src/neolink/target/release/neolink" && \ + "/usr/local/src/neolink/target/release/neolink" --version # Create the release container. Match the base OS used to build FROM debian:buster-slim +ARG TARGETPLATFORM +ARG REPO +ARG VERSION +ARG OWNER +LABEL description="An image for the neolink program which is a reolink camera to rtsp translator" +LABEL repository="$REPO" +LABEL version="$VERSION" +LABEL maintainer="$OWNER" + +# hadolint ignore=DL3008 RUN apt-get update && \ apt-get install -y --no-install-recommends \ libgstrtspserver-1.0-0 \