From c85bb3cd792cded213d9bfd1679bd79d1b2c852c Mon Sep 17 00:00:00 2001 From: Adar Nimrod <nimrod@shore.co.il> Date: Sun, 24 Jan 2021 20:12:04 +0200 Subject: [PATCH] Personal registry. Build and push the personal registry. Use the full address for the Docker Hub registry as opposed to the personal registry. --- .gitlab-ci.yml | 18 ++++++++++++++++++ .pre-commit-hooks.yaml | 7 ++++--- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1f0ae53..1460671 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,3 +4,21 @@ include: file: templates/pre-commit.yml - project: shore/ci-templates file: templates/pre-commit-repo.yml + - project: shore/ci-templates + file: templates/docker.yml + +stages: + - test + - build + - deploy + +variables: + IMAGE: docker-pre-commit + +build: + extends: .docker-build-shore + tags: [ns4.shore.co.il] + +push: + extends: .docker-push-shore + tags: [ns4.shore.co.il] diff --git a/.pre-commit-hooks.yaml b/.pre-commit-hooks.yaml index 2c8ec30..b2ef417 100644 --- a/.pre-commit-hooks.yaml +++ b/.pre-commit-hooks.yaml @@ -5,20 +5,21 @@ description: Dockerfile linter, validate inline bash, written in Haskell minimum_pre_commit_version: '0.18.0' language: docker_image - entry: adarnimrod/docker-pre-commit hadolint + entry: registry.hub.docker.com/adarnimrod/docker-pre-commit hadolint types: [dockerfile] - id: dockerfile-lint name: dockerfile-lint description: A rule based 'linter' for Dockerfiles minimum_pre_commit_version: '0.18.0' language: docker_image - entry: adarnimrod/docker-pre-commit dockerfile-lint + entry: registry.hub.docker.com/adarnimrod/docker-pre-commit dockerfile-lint types: [dockerfile] - id: docker-compose name: docker-compose config description: Validate the Docker Compose file using docker-compose config minimum_pre_commit_version: '0.18.0' language: docker_image - entry: adarnimrod/docker-pre-commit docker-compose-config + entry: |- + registry.hub.docker.com/adarnimrod/docker-pre-commit docker-compose-config files: docker-compose types: [yaml] -- GitLab