Skip to content

Commit a418cf4

Browse files
Bilel ISMAILBilel ISMAIL
Bilel ISMAIL
authored and
Bilel ISMAIL
committed
fixing probelms on chart
1 parent ef09d5e commit a418cf4

3 files changed

Lines changed: 0 additions & 12 deletions

File tree

‎charts/preview/Makefile‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,7 @@ ifeq ($(OS),Darwin)
88
else ifeq ($(OS),Linux)
99
sed -i -e "s/version:.*/version: $(PREVIEW_VERSION)/" Chart.yaml
1010
sed -i -e "s/version:.*/version: $(PREVIEW_VERSION)/" ../*/Chart.yaml
11-
<<<<<<< HEAD
12-
sed -i -e "s|repository: .*|repository: $(DOCKER_REGISTRY)\/lvthillo\/python-flask-docker|" values.yaml
13-
=======
1411
sed -i -e "s|repository: .*|repository: $(DOCKER_REGISTRY)\/bilelismail\/python-flask-docker|" values.yaml
15-
>>>>>>> fec35b6550816426c9a680808545c9ab80097c4b
1612
sed -i -e "s/tag: .*/tag: $(PREVIEW_VERSION)/" values.yaml
1713
else
1814
echo "platfrom $(OS) not supported to release from"

‎charts/python-flask-docker/Makefile‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,7 @@ ifeq ($(OS),Darwin)
3636
sed -i "" -e "s/tag: .*/tag: $(RELEASE_VERSION)/" values.yaml
3737
else ifeq ($(OS),Linux)
3838
sed -i -e "s/version:.*/version: $(RELEASE_VERSION)/" Chart.yaml
39-
<<<<<<< HEAD
40-
sed -i -e "s|repository: .*|repository: $(DOCKER_REGISTRY)\/lvthillo\/python-flask-docker|" values.yaml
41-
=======
4239
sed -i -e "s|repository: .*|repository: $(DOCKER_REGISTRY)\/bilelismail\/python-flask-docker|" values.yaml
43-
>>>>>>> fec35b6550816426c9a680808545c9ab80097c4b
4440
sed -i -e "s/tag: .*/tag: $(RELEASE_VERSION)/" values.yaml
4541
else
4642
echo "platfrom $(OS) not supported to release from"

‎charts/python-flask-docker/values.yaml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
# Default values for python.
22
# This is a YAML-formatted file.
33
# Declare variables to be passed into your templates.
4-
<<<<<<< HEAD
5-
replicaCount: 1
6-
=======
74
replicaCount: 3
8-
>>>>>>> fec35b6550816426c9a680808545c9ab80097c4b
95
image:
106
repository: 10.7.249.99:5000/bilelismail/python-flask-docker
117
tag: 0.0.4

0 commit comments

Comments
 (0)