Commit fdfa9071 authored by Tim Leers's avatar Tim Leers

Add haproxy image

parent 5f489cc1
...@@ -22,6 +22,18 @@ test: ...@@ -22,6 +22,18 @@ test:
script: script:
- make check - make check
# build new haproxy image if dockerfile changes
build:haproxy:
extends: .build-haproxy
rules:
- changes:
- container/Dockerfile.haproxy
# haproxy image can be build when user triggers it
build:haproxy:manual:
extends: .build-haproxy
when: manual
# build new varnish image if dockerfile changes # build new varnish image if dockerfile changes
build:varnish: build:varnish:
extends: .build-varnish extends: .build-varnish
...@@ -223,11 +235,14 @@ example:varnish-pod-template: ...@@ -223,11 +235,14 @@ example:varnish-pod-template:
- kubectl get services --all-namespaces -o wide - kubectl get services --all-namespaces -o wide
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
- docker pull $CI_REGISTRY_IMAGE/varnish-ingress/controller:$CI_COMMIT_SHA - docker pull $CI_REGISTRY_IMAGE/varnish-ingress/controller:$CI_COMMIT_SHA
# using varnish image with latest tag due to performance. if we are changing this image a lot, we need to improve this as can lead to pulling the incorrect image # using haproxy and varnish image with latest tag due to performance. if we are changing this image a lot, we need to improve this as can lead to pulling the incorrect image
- docker pull $CI_REGISTRY_IMAGE/varnish-ingress/varnish:latest - docker pull $CI_REGISTRY_IMAGE/varnish-ingress/varnish:latest
- docker pull $CI_REGISTRY_IMAGE/varnish-ingress/haproxy:latest
- docker tag $CI_REGISTRY_IMAGE/varnish-ingress/controller:$CI_COMMIT_SHA varnish-ingress/controller - docker tag $CI_REGISTRY_IMAGE/varnish-ingress/controller:$CI_COMMIT_SHA varnish-ingress/controller
- docker tag $CI_REGISTRY_IMAGE/varnish-ingress/haproxy:latest varnish-ingress/haproxy
- docker tag $CI_REGISTRY_IMAGE/varnish-ingress/varnish:latest varnish-ingress/varnish - docker tag $CI_REGISTRY_IMAGE/varnish-ingress/varnish:latest varnish-ingress/varnish
- kind load docker-image varnish-ingress/varnish - kind load docker-image varnish-ingress/varnish
- kind load docker-image varnish-ingress/haproxy
- kind load docker-image varnish-ingress/controller - kind load docker-image varnish-ingress/controller
- cd deploy - cd deploy
- ./init.sh - ./init.sh
...@@ -243,6 +258,16 @@ example:varnish-pod-template: ...@@ -243,6 +258,16 @@ example:varnish-pod-template:
script: script:
- cd container - cd container
- make varnish - make varnish
#
# basic step for a pipeline to build the haproxy image
.build-haproxy:
extends: .build-image
stage: build
variables:
IMAGE: haproxy
script:
- cd container
- make haproxy
.build-image: .build-image:
stage: build stage: build
......
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