Loading .gitlab-ci.yml +10 −7 Original line number Diff line number Diff line --- include: - project: shore/ci-templates file: templates/pre-commit.yml - project: shore/ci-templates file: templates/docker.yml build-host01: extends: .compose-build tags: [host01.shore.co.il] stages: - test - build - deploy build-ns4: build: extends: .compose-build tags: [ns4.shore.co.il] build-kodi: extends: .compose-build tags: [kodi.shore.co.il] push: extends: .compose-push tags: [ns4.shore.co.il] crond/Dockerfile +1 −1 Original line number Diff line number Diff line FROM docker:19.03 as docker # hadolint ignore=DL3006 FROM adarnimrod/cron as supersonic FROM registry.shore.co.il/cron as supersonic COPY --from=docker /usr/local/bin/docker /usr/local/bin/ COPY --chown=root:root crontab /crontab # hadolint ignore=DL3002 Loading deploy +1 −0 Original line number Diff line number Diff line Loading @@ -11,6 +11,7 @@ _deploy() { echo "Deploying to $1" >&2 export DOCKER_HOST="ssh://$1" export RUNNER_NAME="$1" until docker-compose pull --quiet; do true; done until docker-compose up --detach --remove-orphans ; do true; done # shellcheck disable=SC2034 for i in $(seq 12) Loading docker-compose.yml +3 −2 Original line number Diff line number Diff line Loading @@ -6,13 +6,13 @@ services: context: runner/ environment: CI_SERVER_URL: "${CI_SERVER_URL:-https://git.shore.co.il}" DOCKER_IMAGE: docker:19.03 DOCKER_IMAGE: registry.shore.co.il/ci-images:docker DOCKER_NETWORK_MODE: &network gitlab-runner REGISTRATION_TOKEN: "${REGISTRATION_TOKEN}" RUNNER_NAME: "${RUNNER_NAME}" REGISTER_RUN_UNTAGGED: "${RUN_UNTAGGED:-true}" RUNNER_TAG_LIST: "${RUNNER_NAME}" image: adarnimrod/gitlab-runner image: registry.shore.co.il/gitlab-runner restart: always volumes: - "${BUILDS:-builds}:/builds" Loading @@ -21,6 +21,7 @@ services: crond: build: context: crond/ image: registry.shore.co.il/gitlab-runner-cron volumes: - /run/docker.sock:/run/docker.sock Loading Loading
.gitlab-ci.yml +10 −7 Original line number Diff line number Diff line --- include: - project: shore/ci-templates file: templates/pre-commit.yml - project: shore/ci-templates file: templates/docker.yml build-host01: extends: .compose-build tags: [host01.shore.co.il] stages: - test - build - deploy build-ns4: build: extends: .compose-build tags: [ns4.shore.co.il] build-kodi: extends: .compose-build tags: [kodi.shore.co.il] push: extends: .compose-push tags: [ns4.shore.co.il]
crond/Dockerfile +1 −1 Original line number Diff line number Diff line FROM docker:19.03 as docker # hadolint ignore=DL3006 FROM adarnimrod/cron as supersonic FROM registry.shore.co.il/cron as supersonic COPY --from=docker /usr/local/bin/docker /usr/local/bin/ COPY --chown=root:root crontab /crontab # hadolint ignore=DL3002 Loading
deploy +1 −0 Original line number Diff line number Diff line Loading @@ -11,6 +11,7 @@ _deploy() { echo "Deploying to $1" >&2 export DOCKER_HOST="ssh://$1" export RUNNER_NAME="$1" until docker-compose pull --quiet; do true; done until docker-compose up --detach --remove-orphans ; do true; done # shellcheck disable=SC2034 for i in $(seq 12) Loading
docker-compose.yml +3 −2 Original line number Diff line number Diff line Loading @@ -6,13 +6,13 @@ services: context: runner/ environment: CI_SERVER_URL: "${CI_SERVER_URL:-https://git.shore.co.il}" DOCKER_IMAGE: docker:19.03 DOCKER_IMAGE: registry.shore.co.il/ci-images:docker DOCKER_NETWORK_MODE: &network gitlab-runner REGISTRATION_TOKEN: "${REGISTRATION_TOKEN}" RUNNER_NAME: "${RUNNER_NAME}" REGISTER_RUN_UNTAGGED: "${RUN_UNTAGGED:-true}" RUNNER_TAG_LIST: "${RUNNER_NAME}" image: adarnimrod/gitlab-runner image: registry.shore.co.il/gitlab-runner restart: always volumes: - "${BUILDS:-builds}:/builds" Loading @@ -21,6 +21,7 @@ services: crond: build: context: crond/ image: registry.shore.co.il/gitlab-runner-cron volumes: - /run/docker.sock:/run/docker.sock Loading