From c3b5c2106c8a246facb5a361c5c928c4317f0b75 Mon Sep 17 00:00:00 2001 From: Kai Kriegel Date: Wed, 14 Dec 2022 18:19:52 +0000 Subject: [PATCH] Update Dockerfile, .gitlab-ci.yml --- .gitlab-ci.yml | 38 ++++++++++++++++++++++++++++++++++++++ Dockerfile | 8 ++++++++ 2 files changed, 46 insertions(+) create mode 100644 .gitlab-ci.yml create mode 100644 Dockerfile diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..996325d --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,38 @@ +# This file is a template, and might need editing before it works on your project. +# To contribute improvements to CI/CD templates, please follow the Development guide at: +# https://docs.gitlab.com/ee/development/cicd/templates.html +# This specific template is located at: +# https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Docker.gitlab-ci.yml + +# Build a Docker image with CI/CD and push to the GitLab registry. +# Docker-in-Docker documentation: https://docs.gitlab.com/ee/ci/docker/using_docker_build.html +# +# This template uses one generic job with conditional builds +# for the default branch and all other (MR) branches. + +docker-build: + # Use the official docker image. + image: docker:latest + stage: build + services: + - docker:dind + before_script: + - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY + # Default branch leaves tag empty (= latest tag) + # All other branches are tagged with the escaped branch name (commit ref slug) + script: + - | + if [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then + tag="" + echo "Running on default branch '$CI_DEFAULT_BRANCH': tag = 'latest'" + else + tag=":$CI_COMMIT_REF_SLUG" + echo "Running on branch '$CI_COMMIT_BRANCH': tag = $tag" + fi + - docker build --pull -t "$CI_REGISTRY_IMAGE${tag}" . + - docker push "$CI_REGISTRY_IMAGE${tag}" + # Run this job in a branch where a Dockerfile exists + rules: + - if: $CI_COMMIT_BRANCH + exists: + - Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..12945bc --- /dev/null +++ b/Dockerfile @@ -0,0 +1,8 @@ +FROM rust:latest + +RUN dpkg --add-architecture arm64 && dpkg --add-architecture armhf +RUN apt-get update -yqq && apt-get install -yqq --no-install-recommends capnproto build-essential cmake clang libclang-dev jq libc6-arm64-cross libc6-dev-arm64-cross gcc-aarch64-linux-gnu libssl-dev:arm64 libc6-armhf-cross libc6-dev-armhf-cross gcc-arm-linux-gnueabihf libssl-dev:armhf +RUN rustup target add aarch64-unknown-linux-gnu +RUN rustup target add armv7-unknown-linux-gnueabihf +RUN rustup component add clippy rustfmt +RUN cargo install cargo2junit