Skip to content

k8s-ingress
k8s-ingress
Commit 2088aa14 authored by Tim Leers's avatar Tim Leers
Browse files
Options

Fix docker caching

parent 17726cdd
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
.gitlab-ci.yml
View file @ 2088aa14
...@@ -58,7 +58,7 @@ build:controller: ...@@ -58,7 +58,7 @@ build:controller:
- apk add -U make - apk add -U make
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
script: script:
- docker pull $CI_REGISTRY_IMAGE/varnish-ingress/varnish-ingress/$IMAGE:latest || true - docker pull $CI_REGISTRY_IMAGE/varnish-ingress/$IMAGE:latest || true
- cd container - cd container
- make controller - make controller
- docker tag varnish-ingress/controller $CI_REGISTRY_IMAGE/varnish-ingress/$IMAGE:$CI_COMMIT_SHA - docker tag varnish-ingress/controller $CI_REGISTRY_IMAGE/varnish-ingress/$IMAGE:$CI_COMMIT_SHA
...@@ -232,7 +232,7 @@ example:authentication:proxy: ...@@ -232,7 +232,7 @@ example:authentication:proxy:
- apk add -U make - apk add -U make
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
script: script:
- docker pull $CI_REGISTRY_IMAGE/varnish-ingress/varnish-ingress/$IMAGE:latest || true - docker pull $CI_REGISTRY_IMAGE/varnish-ingress/$IMAGE:latest || true
- cd container - cd container
- make haproxy - make haproxy
- docker tag varnish-ingress/$IMAGE $CI_REGISTRY_IMAGE/varnish-ingress/$IMAGE:$CI_COMMIT_SHA - docker tag varnish-ingress/$IMAGE $CI_REGISTRY_IMAGE/varnish-ingress/$IMAGE:$CI_COMMIT_SHA
...@@ -252,7 +252,7 @@ example:authentication:proxy: ...@@ -252,7 +252,7 @@ example:authentication:proxy:
- apk add -U make - apk add -U make
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
script: script:
- docker pull $CI_REGISTRY_IMAGE/varnish-ingress/varnish-ingress/$IMAGE:latest || true - docker pull $CI_REGISTRY_IMAGE/varnish-ingress/$IMAGE:latest || true
- cd container - cd container
- make varnish - make varnish
- docker tag varnish-ingress/$IMAGE $CI_REGISTRY_IMAGE/varnish-ingress/$IMAGE:$CI_COMMIT_SHA - docker tag varnish-ingress/$IMAGE $CI_REGISTRY_IMAGE/varnish-ingress/$IMAGE:$CI_COMMIT_SHA
......
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