Commit 669b3525 authored by David Mendez's avatar David Mendez
Browse files

Merge branch 'staging' into 'master'

Trigger rebuild

See merge request !86
parents 0f62688e f9613070
......@@ -43,7 +43,7 @@ stages:
# ----------------------------------------------------------------------------------------------------------------------
build_docker_image_server:
image:
name: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/docker/compose:1.24.1
name: docker/compose:1.24.1
entrypoint: [ "/bin/sh", "-c" ]
stage: build
variables:
......@@ -86,7 +86,7 @@ pylint:
prepare_config_tests:
stage: prepare_config_tests
image:
name: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/alpine/git
name: alpine/git
entrypoint: [ "/bin/sh", "-c" ]
except:
- schedules
......@@ -116,7 +116,7 @@ unit_tests:
prepare_config_staging:
stage: prepare_config_staging
image:
name: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/alpine/git
name: alpine/git
entrypoint: [ "/bin/sh", "-c" ]
only:
- staging
......@@ -137,7 +137,7 @@ prepare_config_staging:
deploy_to_staging:
stage: deploy_to_staging
image:
name: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/lachlanevenson/k8s-kubectl:latest
name: lachlanevenson/k8s-kubectl:latest
entrypoint: [ "/bin/sh", "-c" ]
only:
- staging
......@@ -206,7 +206,7 @@ functional_tests_staging:
prepare_config_prod_hx:
stage: prepare_config_hx_hh
image:
name: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/alpine/git
name: alpine/git
entrypoint: [ "/bin/sh", "-c" ]
only:
- master
......@@ -226,7 +226,7 @@ prepare_config_prod_hx:
deploy_to_prod_hx:
stage: deploy_to_prod_hx_hh
image:
name: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/lachlanevenson/k8s-kubectl:latest
name: lachlanevenson/k8s-kubectl:latest
entrypoint: [ "/bin/sh", "-c" ]
only:
- master
......@@ -287,7 +287,7 @@ functional_tests_prod_hx:
prepare_config_prod_hh:
stage: prepare_config_hx_hh
image:
name: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/alpine/git
name: alpine/git
entrypoint: [ "/bin/sh", "-c" ]
only:
- master
......@@ -307,7 +307,7 @@ prepare_config_prod_hh:
deploy_to_prod_hh:
stage: deploy_to_prod_hx_hh
image:
name: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/lachlanevenson/k8s-kubectl:latest
name: lachlanevenson/k8s-kubectl:latest
entrypoint: [ "/bin/sh", "-c" ]
only:
- master
......@@ -383,7 +383,7 @@ functional_tests_prod_public:
# ----------------------------------------------------------------------------------------------------------------------
delete_expired_jobs:
stage: schedules
image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/python:3.7
image: python:3.7
only:
- schedules
script:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment