diff options
| author | lbonn <lbonn@users.noreply.github.com> | 2019-07-24 16:32:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-24 16:32:19 +0200 |
| commit | 1e229a8747283d93eca0fc3c8ef90c52aca4187d (patch) | |
| tree | 1e85f1c489bc49b9200ee2e634a3a02c6bfa7593 /scripts/ci/gitlab/docker.yml | |
| parent | 7896e16972f8c76689d090ae36b5f580f0e8667a (diff) | |
| parent | 383144042a1354a0d1e6d042e77bdb0faaba9ed2 (diff) | |
| download | meta-updater-1e229a8747283d93eca0fc3c8ef90c52aca4187d.tar.gz | |
Move `before_script` gitlab steps to `script` (#563)
Move `before_script` gitlab steps to `script`
Diffstat (limited to 'scripts/ci/gitlab/docker.yml')
| -rw-r--r-- | scripts/ci/gitlab/docker.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/ci/gitlab/docker.yml b/scripts/ci/gitlab/docker.yml index 5b81d77..ba488c6 100644 --- a/scripts/ci/gitlab/docker.yml +++ b/scripts/ci/gitlab/docker.yml | |||
| @@ -10,9 +10,9 @@ | |||
| 10 | stage: docker | 10 | stage: docker |
| 11 | services: | 11 | services: |
| 12 | - docker:18-dind | 12 | - docker:18-dind |
| 13 | before_script: | ||
| 14 | - docker login -u gitlab-ci-token -p "$CI_JOB_TOKEN" "$CI_REGISTRY" | ||
| 15 | script: | 13 | script: |
| 14 | - docker login -u gitlab-ci-token -p "$CI_JOB_TOKEN" "$CI_REGISTRY" | ||
| 15 | |||
| 16 | - docker pull "$BITBAKE_IMAGE" || docker pull "$BITBKAE_IMAGE_MASTER" || true | 16 | - docker pull "$BITBAKE_IMAGE" || docker pull "$BITBKAE_IMAGE_MASTER" || true |
| 17 | - docker build --pull --cache-from "$BITBKAE_IMAGE_MASTER" --cache-from "$BITBAKE_IMAGE" -f ./scripts/ci/Dockerfile.bitbake -t "$BITBAKE_IMAGE" ./scripts/ci | 17 | - docker build --pull --cache-from "$BITBKAE_IMAGE_MASTER" --cache-from "$BITBAKE_IMAGE" -f ./scripts/ci/Dockerfile.bitbake -t "$BITBAKE_IMAGE" ./scripts/ci |
| 18 | - docker push "$BITBAKE_IMAGE" | 18 | - docker push "$BITBAKE_IMAGE" |
| @@ -30,8 +30,8 @@ | |||
| 30 | stage: docker | 30 | stage: docker |
| 31 | services: | 31 | services: |
| 32 | - docker:18-dind | 32 | - docker:18-dind |
| 33 | before_script: | ||
| 34 | - docker login -u gitlab-ci-token -p "$CI_JOB_TOKEN" "$CI_REGISTRY" | ||
| 35 | script: | 33 | script: |
| 34 | - docker login -u gitlab-ci-token -p "$CI_JOB_TOKEN" "$CI_REGISTRY" | ||
| 35 | |||
| 36 | - docker pull "$BITBAKE_IMAGE" | 36 | - docker pull "$BITBAKE_IMAGE" |
| 37 | - docker pull "$BITBAKE_CHECKOUT_IMAGE" | 37 | - docker pull "$BITBAKE_CHECKOUT_IMAGE" |