Test deploy

This commit is contained in:
Marcin S 2021-05-18 15:35:24 -04:00
parent 726c66942c
commit 9346898775
No known key found for this signature in database
GPG Key ID: 68A476F4791BB6B3
5 changed files with 16 additions and 10 deletions

View File

@ -1,10 +1,10 @@
version: '3.7' version: "3.7"
services: services:
sia: sia:
environment: environment:
- JAEGER_DISABLED=${JAEGER_DISABLED:-true} # Enable/Disable tracing - JAEGER_DISABLED=${JAEGER_DISABLED:-true} # Enable/Disable tracing
- JAEGER_SERVICE_NAME=${PORTAL_NAME:-Skyd} # change to e.g. eu-ger-1 - JAEGER_SERVICE_NAME=${PORTAL_NAME:-Skyd} # change to e.g. eu-ger-1
# Configuration # Configuration
# See https://github.com/jaegertracing/jaeger-client-go#environment-variables # See https://github.com/jaegertracing/jaeger-client-go#environment-variables
# for all options. # for all options.
@ -16,7 +16,11 @@ services:
jaeger-agent: jaeger-agent:
image: jaegertracing/jaeger-agent image: jaegertracing/jaeger-agent
command: [ "--reporter.grpc.host-port=jaeger-collector:14250", "--reporter.grpc.retry.max=1000" ] command:
[
"--reporter.grpc.host-port=jaeger-collector:14250",
"--reporter.grpc.retry.max=1000",
]
container_name: jaeger-agent container_name: jaeger-agent
restart: on-failure restart: on-failure
expose: expose:

View File

@ -4,4 +4,4 @@ outlined in the README in the root directory, under "Setting up CockroachDB".
The only difference between the files here and those under The only difference between the files here and those under
`docker/cockroach/certs` is that the files here need to be readable by anyone, while the files under `cockroach` need to `docker/cockroach/certs` is that the files here need to be readable by anyone, while the files under `cockroach` need to
have their original access rights have their original access rights
(all *.key files should be 600 instead of 644 there). (all \*.key files should be 600 instead of 644 there).

View File

@ -397,6 +397,7 @@ server {
# proxy /skynet/tus requests to siad endpoint with all arguments # proxy /skynet/tus requests to siad endpoint with all arguments
proxy_pass http://siad; proxy_pass http://siad;
proxy_redirect https://siad/ https://$domain.$tld/;
} }
location /skynet/metadata { location /skynet/metadata {

View File

@ -37,9 +37,8 @@ export default function SelfServiceForm({ flow, config, fieldsConfig, title, but
"border-gray-300 placeholder-gray-400 focus:ring-green-500 focus:border-green-500": !Boolean( "border-gray-300 placeholder-gray-400 focus:ring-green-500 focus:border-green-500": !Boolean(
field?.messages?.length field?.messages?.length
), ),
"border-red-300 text-red-900 placeholder-red-300 focus:ring-red-500 focus:border-red-500": Boolean( "border-red-300 text-red-900 placeholder-red-300 focus:ring-red-500 focus:border-red-500":
field?.messages?.length Boolean(field?.messages?.length),
),
} }
)} )}
/> />

View File

@ -2,7 +2,8 @@
This package contains useful scripts for managing a Skynet Webportal. This package contains useful scripts for managing a Skynet Webportal.
## Available Scripts ## Available Scripts
**blocklist-skylink.sh**\ **blocklist-skylink.sh**\
The `blocklist-skylink.sh` script adds a skylink to the blocklist on all The `blocklist-skylink.sh` script adds a skylink to the blocklist on all
servers. servers.
@ -29,11 +30,12 @@ The `portal-upgrade.sh` script upgrades the docker images for a portal and
clears and leftover images. clears and leftover images.
## Webportal Upgrade Procedures ## Webportal Upgrade Procedures
TODO... TODO...
1. 1 server upgraded at a time 1. 1 server upgraded at a time
1. Clusters of servers upgraded at a time 1. Clusters of servers upgraded at a time
1. How to safetly revert to previous stable version. Document what those 1. How to safetly revert to previous stable version. Document what those
versions were. versions were.
1. Upgrading single subsystem 1. Upgrading single subsystem
1. Upgrading multiple subsystems 1. Upgrading multiple subsystems