From eff9f32ccec3c7a0f60a6ebd6c1c8c9a36d5e48a Mon Sep 17 00:00:00 2001 From: cozyGalvinism Date: Mon, 25 Mar 2024 15:51:28 +0100 Subject: [PATCH] Add postgres label and dind rust image --- .github/workflows/rust-dind.yml | 108 ++++++++++++++++++++++++++++++++ .github/workflows/rust.yml | 6 +- rust-dind/Dockerfile | 23 +++++++ 3 files changed, 135 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/rust-dind.yml create mode 100644 rust-dind/Dockerfile diff --git a/.github/workflows/rust-dind.yml b/.github/workflows/rust-dind.yml new file mode 100644 index 0000000..6fba601 --- /dev/null +++ b/.github/workflows/rust-dind.yml @@ -0,0 +1,108 @@ +name: Build and publish Docker images + +# This workflow uses actions that are not certified by GitHub. +# They are provided by a third-party and are governed by +# separate terms of service, privacy policy, and support +# documentation. + +on: + push: + branches: [ "develop" ] + pull_request: + branches: [ "develop" ] + +env: + # Use docker.io for Docker Hub if empty + REGISTRY: ghcr.io + # github.repository as / + IMAGE_NAME: ${{ github.repository_owner }}/agent-rust-dind + DIRECTORY: rust-dind + + +jobs: + build: + + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + # This is used to complete the identity challenge + # with sigstore/fulcio when running outside of PRs. + id-token: write + strategy: + fail-fast: false + matrix: + version: + - stable + host: + - 'x86_64-unknown-linux-gnu' + - 'x86_64-pc-windows-gnu' + include: + - packages: '' + - label: 'vanilla' + - host: 'x86_64-pc-windows-gnu' + packages: 'gcc-mingw-w64-x86-64' + - host: 'x86_64-unknown-linux-gnu' + packages: 'libpq-dev' + label: 'postgres' + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + # Install the cosign tool except on PR + # https://github.com/sigstore/cosign-installer + - name: Install cosign + if: github.event_name != 'pull_request' + uses: sigstore/cosign-installer@6e04d228eb30da1757ee4e1dd75a0ec73a653e06 #v3.1.1 + with: + cosign-release: 'v2.1.1' + + # Set up BuildKit Docker container builder to be able to build + # multi-platform images and export cache + # https://github.com/docker/setup-buildx-action + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0 + + # Login against a Docker registry except on PR + # https://github.com/docker/login-action + - name: Log into registry ${{ env.REGISTRY }} + if: github.event_name != 'pull_request' + uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0 + with: + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + # Extract metadata (tags, labels) for Docker + # https://github.com/docker/metadata-action + - name: Extract Docker metadata + id: meta + uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5.0.0 + with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + tags: | + type=schedule + type=ref,event=branch + type=ref,event=tag + type=ref,event=pr + type=raw,value=${{ matrix.label }} + type=raw,value=rust-${{ matrix.version }} + type=raw,value=${{ matrix.host }} + + # Build and push Docker image with Buildx (don't push on PR) + # https://github.com/docker/build-push-action + - name: Build and push Docker image + id: build-and-push + uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0 + with: + context: ${{ env.DIRECTORY }} + push: ${{ github.event_name != 'pull_request' }} + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + cache-from: type=gha + cache-to: type=gha,mode=max + build-args: | + VERSION=${{ matrix.version }} + HOST=${{ matrix.host }} + ADDITIONAL_PACKAGES=${{ matrix.packages }} diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 8b39837..d1e1f8e 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -39,9 +39,11 @@ jobs: include: - packages: '' - label: 'vanilla' - - version: stable - host: 'x86_64-pc-windows-gnu' + - host: 'x86_64-pc-windows-gnu' packages: 'gcc-mingw-w64-x86-64' + - host: 'x86_64-unknown-linux-gnu' + packages: 'libpq-dev' + label: 'postgres' steps: - name: Checkout repository diff --git a/rust-dind/Dockerfile b/rust-dind/Dockerfile new file mode 100644 index 0000000..4f6e45e --- /dev/null +++ b/rust-dind/Dockerfile @@ -0,0 +1,23 @@ +FROM ghcr.io/felipecrs/jenkins-agent-dind + +ARG VERSION=stable +ARG HOST=x86_64-unknown-linux-gnu +ARG ADDITIONAL_PACKAGES="" + +USER root + +RUN if [ -n "$ADDITIONAL_PACKAGES" ]; then apt-get update && apt-get install -y $ADDITIONAL_PACKAGES && \ + rm -rf /var/lib/apt/lists/*; fi + +USER jenkins + +RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain $VERSION -t $HOST +ENV PATH="/home/jenkins/.cargo/bin:${PATH}" + +# install some more tools +# cargo-binstall +RUN curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash +# cargo-nextest +RUN cargo binstall cargo-nextest --secure -y +# cargo-llvm-cov +RUN curl --proto '=https' --tlsv1.2 -fsSL https://github.com/taiki-e/cargo-llvm-cov/releases/latest/download/cargo-llvm-cov-x86_64-unknown-linux-gnu.tar.gz | tar xzf - -C "$HOME/.cargo/bin"