diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7d7e1d6f8c00760fed9994ccea6b6ba7b0e36580..45d7d5d5dc05ff5ba29b81b69ce5364c48106129 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 53b75a0c3b85fb061c059a294a93f379c758c15f..fb6f9361413f25163885e73dc80f9adc4b8d6b37 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 5dcd6ae17c331aff05bf7b999b1f24a74c55007d..78e07c693bd1c86e45ac1e786f51d3f162f0692b 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 69f9091f60e5c41ea34677c05765df1400c7c4e0..6f9763f63a3ac067d075b4f9d4614b9721d0b051 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"