Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9644f72 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Use docker slim image

parent 6bb9aa36

gitlab-ci/.gitlab-ci-auto-merge-main.yml

+1 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ variables: 
  CI_PROJECT_SSH_URL: git@gitlab.e.foundation:$CI_PROJECT_PATH



.auto-merge-main:

  image: registry.gitlab.e.foundation/e/tools/docker-tools:latest

  image: registry.gitlab.e.foundation/e/os/docker-android-apps-cicd:slim-latest

  stage: auto-merge-main

  rules:

    - if: '$CI_COMMIT_REF_NAME =~ $BRANCH_NAME_REGEX'
@@ -17,7 +17,6 @@ variables: 
  variables:

    GIT_STRATEGY: none

  before_script:

    - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'

    - eval $(ssh-agent -s)

    - echo "${SSH_E_ROBOT_PRIVATE_KEY}" | tr -d '\r' | ssh-add - > /dev/null

    - mkdir -p ~/.ssh

gitlab-ci/.gitlab-ci-import-device-updates-from-upstream.yml

+1 −2
Original line number Diff line number Diff line
@@ -6,14 +6,13 @@ variables: 
  CI_PROJECT_SSH_URL: git@gitlab.e.foundation:$CI_PROJECT_PATH



.update-from-upstream:

  image: registry.gitlab.e.foundation/e/tools/docker-tools:latest

  image: registry.gitlab.e.foundation/e/os/docker-android-apps-cicd:slim-latest

  stage: update-from-upstream

  rules:

    - if: '$CI_PIPELINE_SOURCE =~ /schedule/ && $CI_COMMIT_REF_NAME == $LOCAL_BRANCH'

  variables:

    GIT_STRATEGY: none

  before_script:

    - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'

    - eval $(ssh-agent -s)

    - echo "${SSH_E_ROBOT_PRIVATE_KEY}" | tr -d '\r' | ssh-add - > /dev/null

    - mkdir -p ~/.ssh

gitlab-ci/.gitlab-ci-import-updates-from-upstream.yml

+1 −2
Original line number Diff line number Diff line
@@ -6,14 +6,13 @@ variables: 
  CI_PROJECT_SSH_URL: git@gitlab.e.foundation:$CI_PROJECT_PATH



.update-from-upstream:

  image: registry.gitlab.e.foundation/e/tools/docker-tools:latest

  image: registry.gitlab.e.foundation/e/os/docker-android-apps-cicd:slim-latest

  stage: update-from-upstream

  rules:

    - if: '$CI_PIPELINE_SOURCE =~ /schedule/ && $CI_COMMIT_REF_NAME == $LOCAL_BRANCH'

  variables:

    GIT_STRATEGY: none

  before_script:

    - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'

    - eval $(ssh-agent -s)

    - echo "${SSH_E_ROBOT_PRIVATE_KEY}" | tr -d '\r' | ssh-add - > /dev/null

    - mkdir -p ~/.ssh