From c7ced1c94938c0d969cb94999f7dcd70b9606b3d Mon Sep 17 00:00:00 2001 From: Karsten Dambekalns Date: Wed, 20 Oct 2021 09:19:50 +0200 Subject: [PATCH 1/3] Build only v3.*.* in docker.build.yaml --- .github/workflows/docker.build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.build.yaml b/.github/workflows/docker.build.yaml index d2d9923..1a2cd5d 100644 --- a/.github/workflows/docker.build.yaml +++ b/.github/workflows/docker.build.yaml @@ -6,7 +6,7 @@ on: branches-ignore: - '**' tags: - - 'v*.*.*' + - 'v3.*.*' jobs: build: From 5c509d36b5968a1ec116b3f8160bb4f920249781 Mon Sep 17 00:00:00 2001 From: Karsten Dambekalns Date: Wed, 20 Oct 2021 09:20:48 +0200 Subject: [PATCH 2/3] Use v3 branch in docker.build.yaml --- .github/workflows/docker.build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.build.yaml b/.github/workflows/docker.build.yaml index 1a2cd5d..78e419f 100644 --- a/.github/workflows/docker.build.yaml +++ b/.github/workflows/docker.build.yaml @@ -14,7 +14,7 @@ jobs: steps: - uses: actions/checkout@v2 with: - ref: 'main' + ref: 'v3' fetch-depth: 100 - name: Determine latest version From d8c86f27706f1147ad45d14bd1619f815bfef36f Mon Sep 17 00:00:00 2001 From: Robert Lemke Date: Thu, 13 Jan 2022 13:57:19 +0100 Subject: [PATCH 3/3] Don't use max expiry time for persistent resources --- root-files/opt/flownative/lib/nginx-legacy.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/root-files/opt/flownative/lib/nginx-legacy.sh b/root-files/opt/flownative/lib/nginx-legacy.sh index 6609f78..8fde553 100644 --- a/root-files/opt/flownative/lib/nginx-legacy.sh +++ b/root-files/opt/flownative/lib/nginx-legacy.sh @@ -176,8 +176,9 @@ EOM cat >>"${NGINX_CONF_PATH}/sites-enabled/site.conf" <<-EOM location ~* ^${BEACH_PERSISTENT_RESOURCES_BASE_PATH}([a-f0-9]+)/ { resolver 8.8.8.8; - expires max; + expires 3600; proxy_set_header Authorization ""; + add_header Via 'Beach Asset Proxy'; proxy_pass http://storage.googleapis.com/${BEACH_GOOGLE_CLOUD_STORAGE_PUBLIC_BUCKET}/\$1\$is_args\$args; } EOM @@ -185,7 +186,7 @@ EOM cat >>"${NGINX_CONF_PATH}/sites-enabled/site.conf" <<-EOM location ~* ^/_Resources/Persistent/(.*)$ { access_log off; - expires max; + expires 3600; try_files \$uri @fallback; } @@ -208,7 +209,7 @@ EOM # for all static resources location ~ ^/_Resources/Static/ { access_log off; - expires max; + expires 3600; } } EOM