From dc499535fd595f69a2c54ea777265c242f69b536 Mon Sep 17 00:00:00 2001
From: Dmytro Bogatov <dmytro@dbogatov.org>
Date: Thu, 8 Feb 2018 01:28:44 -0500
Subject: [PATCH] Fix.
---
.gitlab-ci.yml | 2 ++
build.sh | 2 ++
deployment/build-services.sh | 6 +++---
deployment/sources/service/deployment.yaml | 1 -
4 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7d7e1d6..45d7d5d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -140,6 +140,7 @@ release-app-docs:
release-debian:
stage: release
+ dependencies: []
image: dbogatov/docker-images:debian-latest
script:
- ./build.sh -f build-debian-package
@@ -151,6 +152,7 @@ release-debian:
release-deployment:
stage: release
+ dependencies: []
image: dbogatov/docker-images:alpine-extras-latest
script:
- ./build.sh -f build-deployment
diff --git a/build.sh b/build.sh
index 53b75a0..fb6f936 100755
--- a/build.sh
+++ b/build.sh
@@ -304,6 +304,8 @@ build-deployment () {
./build-services.sh $DOTNET_TAG
+ rm -rf config.yaml
+
mv services/namespace.yaml config.yaml
cat services/**/*.yaml >> config.yaml
diff --git a/deployment/build-services.sh b/deployment/build-services.sh
index 5dcd6ae..78e07c6 100755
--- a/deployment/build-services.sh
+++ b/deployment/build-services.sh
@@ -37,9 +37,9 @@ do
PORT="5432"
fi
- sed -i '' -e "s#__NAME__#$service#g" services/$service/{service,deployment}.yaml
- sed -i '' -e "s#__IMAGE__#$IMAGE#g" services/$service/{service,deployment}.yaml
- sed -i '' -e "s#__PORT__#$PORT#g" services/$service/{service,deployment}.yaml
+ sed -i -e "s#__NAME__#$service#g" services/$service/{service,deployment}.yaml
+ sed -i -e "s#__IMAGE__#$IMAGE#g" services/$service/{service,deployment}.yaml
+ sed -i -e "s#__PORT__#$PORT#g" services/$service/{service,deployment}.yaml
done
diff --git a/deployment/sources/service/deployment.yaml b/deployment/sources/service/deployment.yaml
index 69f9091..6f9763f 100644
--- a/deployment/sources/service/deployment.yaml
+++ b/deployment/sources/service/deployment.yaml
@@ -23,7 +23,6 @@ spec:
volumeMounts:
- name: appsettings
mountPath: "/run/secrets/"
- # readOnly: true
env:
- name: POSTGRES_DB
value: "statussite"
--
GitLab