diff --git a/.gitignore b/.gitignore index 00b75270..fa7c2589 100644 --- a/.gitignore +++ b/.gitignore @@ -87,3 +87,9 @@ docker/nginx/conf.d/server-override/* __pycache__ /.idea/ /venv* + +# CockroachDB certificates +.cr_certs/ + +# Oathkeeper JWKS signing token +docker/kratos/oathkeeper/id_token.jwks.json diff --git a/docker-compose.yml b/docker-compose.yml index e2365137..1b9e8591 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -175,6 +175,9 @@ services: - SKYNET_DB_PORT=27017 - SKYNET_DB_USER=${SKYNET_DB_USER} - SKYNET_DB_PASS=${SKYNET_DB_PASS} + - COOKIE_DOMAIN=${COOKIE_DOMAIN} + - COOKIE_HASH_KEY=${COOKIE_HASH_KEY} + - COOKIE_ENC_KEY=${COOKIE_ENC_KEY} expose: - 3000 networks: diff --git a/docker/accounts/Dockerfile b/docker/accounts/Dockerfile index 6a098092..ae69d946 100644 --- a/docker/accounts/Dockerfile +++ b/docker/accounts/Dockerfile @@ -6,12 +6,10 @@ ENV GOARCH amd64 WORKDIR /root -RUN go get -d -u github.com/NebulousLabs/skynet-accounts/... && \ - ln -s $GOPATH/src/github.com/NebulousLabs/skynet-accounts ./ && \ - cd $GOPATH/src/github.com/NebulousLabs/skynet-accounts && \ - make release && \ - cd && \ - rm -rf $GOPATH/src/github.com/NebulousLabs/skynet-accounts +RUN git clone --single-branch --branch ivo/uploads_and_downloads https://github.com/NebulousLabs/skynet-accounts.git && \ + cd skynet-accounts && \ + go mod download && \ + make release ENV SKYNET_DB_HOST="localhost" ENV SKYNET_DB_PORT="27017" diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index a5a92e8a..3900cad8 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -6,7 +6,7 @@ } (siasky.net) { - siasky.net, *.siasky.net, *.hns.siasky.net { + siasky.xyz, *.siasky.xyz, *.hns.siasky.xyz { tls { dns route53 { max_retries 50 @@ -27,4 +27,4 @@ import localhost # import custom.domain -# import siasky.net +import siasky.net