egommerce/api-gateway
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop'
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Piotr Biernat 2022-10-06 20:48:22 +02:00
commit 01a2061d70
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
data/etc/nginx/apigw.conf
View File

@ -2,7 +2,8 @@ include apigw_backends.conf;
include apigw_keys.conf; include apigw_keys.conf;
server { server {
access_log /var/log/nginx/apigw_access.log main; access_log /var/log/nginx/apigw_access.log main;
error_log /var/log/nginx/apigw_error.log warn;
listen 80; listen 80;
# listen 443 ssl; # listen 443 ssl;
@ -30,9 +31,6 @@ server {
location = /_validate_apikey { location = /_validate_apikey {
internal; internal;
access_log /var/log/nginx/apigw_access.log main;
error_log /var/log/nginx/apigw_error.log warn;
if ($http_apikey = "") { if ($http_apikey = "") {
return 401; # Unauthorized return 401; # Unauthorized
} }

7
deploy/image-build.sh
View File

@ -3,11 +3,4 @@
export IMAGE_NAME="git.pbiernat.dev/egommerce/apigw-svc" export IMAGE_NAME="git.pbiernat.dev/egommerce/apigw-svc"
branch=${DRONE_TAG:=$CI_COMMIT_BRANCH}
branch=$(echo $branch | grep -v /) || echo $branch ;
p1=$(echo $branch | cut -d / -f1 -s) &&
p2=$(echo $branch | cut -d / -f2 -s) &&
tag=${branch:=$p1-$p2} &&
echo "Building" $tag
docker build --rm --cache-from "$IMAGE_NAME:latest" -t "$IMAGE_NAME:latest" . docker build --rm --cache-from "$IMAGE_NAME:latest" -t "$IMAGE_NAME:latest" .