Commit 148aa47d authored by nimrod's avatar nimrod
Browse files

Use images from the personal registry. 

Faster and no rate limits. Win-win.
parent fdb8a678

templates/bats.yml

+1 −1
Original line number Diff line number Diff line 
---

bats:

  stage: test

  image: adarnimrod/ci-images:bats

  image: registry.shore.co.il/ci-images:bats

  tags: [ns4.shore.co.il]

  script:

    - bats tests/ | tee results.tap

templates/docker.yml

+7 −7
Original line number Diff line number Diff line 
---

.compose-build:

  image: adarnimrod/ci-images:docker

  image: &image registry.shore.co.il/ci-images:docker

  stage: build

  variables:

    COMPOSE_DOCKER_CLI_BUILD: "1"
@@ -21,7 +21,7 @@ 
    - docker-compose build --no-cache --pull



.docker-build-hub:

  image: docker:19.03

  image: *image

  stage: build

  variables:

    DOCKER_BUILDKIT: "1"
@@ -31,7 +31,7 @@ 
    - docker build -t "adarnimrod/$IMAGE:$TAG" ./



.docker-build-shore:

  image: docker:19.03

  image: *image

  stage: build

  tags: ["ns4.shore.co.il"]

  variables:
@@ -42,7 +42,7 @@ 
    - docker build -t "registry.shore.co.il/$IMAGE:$TAG" ./



.compose-push:

  image: adarnimrod/ci-images:docker

  image: *image

  stage: deploy

  tags: ["ns4.shore.co.il"]

  only:
@@ -59,7 +59,7 @@ 
    - docker-compose push



.docker-push-hub:

  image: docker:19.03

  image: *image

  stage: deploy

  only:

    - branches
@@ -71,7 +71,7 @@ 
    - docker push "adarnimrod/$IMAGE:$TAG"



.docker-push-shore:

  image: docker:19.03

  image: *image

  stage: deploy

  tags: ["ns4.shore.co.il"]

  only:
@@ -83,7 +83,7 @@ 
    - docker push "registry.shore.co.il/$IMAGE:$TAG"



.compose-run:

  image: adarnimrod/ci-images:docker

  image: *image

  stage: deploy

  when: manual

  before_script:

templates/pre-commit-repo.yml

+1 −1
Original line number Diff line number Diff line 
---

pre-commit-repo:

  stage: test

  image: adarnimrod/ci-images:pre-commit

  image: registry.shore.co.il/ci-images:pre-commit

  tags: [ns4.shore.co.il]

  variables:

    XDG_CACHE_HOME: "$CI_PROJECT_DIR/.cache"

templates/pre-commit.yml

+1 −1
Original line number Diff line number Diff line 
---

pre-commit:

  stage: test

  image: adarnimrod/ci-images:pre-commit

  image: registry.shore.co.il/ci-images:pre-commit

  tags: [ns4.shore.co.il]

  variables:

    XDG_CACHE_HOME: "$CI_PROJECT_DIR/.cache"

templates/presentation.yml

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ build: 
  stage: build

  tags: [ns4.shore.co.il]

  image:

    name: adarnimrod/presentation

    name: registry.shore.co.il/presentation

    entrypoint: [""]

  script:

    - make --jobs=4