Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
k8s-ingress
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
3
Merge Requests
3
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
uplex-varnish
k8s-ingress
Commits
aa66dc14
Commit
aa66dc14
authored
May 25, 2020
by
Tim Leers
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename image to klarlack
parent
590e42dd
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
4 deletions
+26
-4
.gitlab-ci.yml
.gitlab-ci.yml
+23
-1
Dockerfile.klarlack
container/Dockerfile.klarlack
+0
-0
Makefile
container/Makefile
+3
-3
No files found.
.gitlab-ci.yml
View file @
aa66dc14
...
@@ -55,6 +55,18 @@ build:haproxy:manual:
...
@@ -55,6 +55,18 @@ build:haproxy:manual:
extends
:
.build-haproxy
extends
:
.build-haproxy
when
:
manual
when
:
manual
# build new klarlack image if dockerfile changes
build:klarlack
:
extends
:
.build-klarlack
rules
:
-
changes
:
-
container/Dockerfile.klarlack
# klarlack image can be build when user triggers it
build:klarlack:manual
:
extends
:
.build-klarlack
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
...
@@ -278,7 +290,17 @@ example:varnish-pod-template:
...
@@ -278,7 +290,17 @@ example:varnish-pod-template:
IMAGE
:
varnish
IMAGE
:
varnish
script
:
script
:
-
cd container
-
cd container
-
make varnish-bionic
-
make varnish
# basic step for a pipeline to build the klarlack image
.build-klarlack
:
extends
:
.build-image
stage
:
build
variables
:
IMAGE
:
klarlack
script
:
-
cd container
-
make klarlack
# basic step for a pipeline to build the haproxy image
# basic step for a pipeline to build the haproxy image
.build-haproxy
:
.build-haproxy
:
...
...
container/Dockerfile.
varnish.bionic
→
container/Dockerfile.
klarlack
View file @
aa66dc14
File moved
container/Makefile
View file @
aa66dc14
...
@@ -49,9 +49,9 @@ varnish: Dockerfile.varnish docker-minikube
...
@@ -49,9 +49,9 @@ varnish: Dockerfile.varnish docker-minikube
docker build
$(DOCKER_BUILD_OPTIONS)
-t
$(IMAGE_REPO)
varnish-ingress/varnish
\
docker build
$(DOCKER_BUILD_OPTIONS)
-t
$(IMAGE_REPO)
varnish-ingress/varnish
\
-f
Dockerfile.varnish .
-f
Dockerfile.varnish .
varnish-bionic
:
Dockerfile.varnish.bionic
docker-minikube
klarlack
:
Dockerfile.klarlack
docker-minikube
docker build
$(DOCKER_BUILD_OPTIONS)
-t
$(IMAGE_REPO)
varnish-ingress/
varnish
\
docker build
$(DOCKER_BUILD_OPTIONS)
-t
$(IMAGE_REPO)
varnish-ingress/
klarlack
\
-f
Dockerfile.
varnish.bionic
.
-f
Dockerfile.
klarlack
.
haproxy
:
Dockerfile.haproxy docker-minikube
haproxy
:
Dockerfile.haproxy docker-minikube
docker build
$(DOCKER_BUILD_OPTIONS)
-t
$(IMAGE_REPO)
varnish-ingress/haproxy
\
docker build
$(DOCKER_BUILD_OPTIONS)
-t
$(IMAGE_REPO)
varnish-ingress/haproxy
\
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment