From 96c5b5df730330bed8609a8d75bd64c13955fbb8 Mon Sep 17 00:00:00 2001 From: Ivaylo Novakov Date: Wed, 14 Apr 2021 12:43:57 +0200 Subject: [PATCH 1/3] Configure accounts' branch from docker-compose.accounts.yml. --- docker-compose.accounts.yml | 2 ++ docker/accounts/Dockerfile | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/docker-compose.accounts.yml b/docker-compose.accounts.yml index 22d24541..f90391ad 100644 --- a/docker-compose.accounts.yml +++ b/docker-compose.accounts.yml @@ -24,6 +24,8 @@ services: build: context: ./docker/accounts dockerfile: Dockerfile + args: + branch: ivo/limit_delete container_name: accounts restart: unless-stopped logging: *default-logging diff --git a/docker/accounts/Dockerfile b/docker/accounts/Dockerfile index 8be44370..a87171a2 100644 --- a/docker/accounts/Dockerfile +++ b/docker/accounts/Dockerfile @@ -4,9 +4,11 @@ LABEL maintainer="NebulousLabs " ENV GOOS linux ENV GOARCH amd64 +ARG branch=main + WORKDIR /root -RUN git clone --single-branch --branch main https://github.com/NebulousLabs/skynet-accounts.git && \ +RUN git clone --single-branch --branch ${branch} https://github.com/NebulousLabs/skynet-accounts.git && \ cd skynet-accounts && \ go mod download && \ make release From 48dbb9a6330e720da9ac6de1c834cff813532dc6 Mon Sep 17 00:00:00 2001 From: Ivaylo Novakov Date: Wed, 14 Apr 2021 13:26:11 +0200 Subject: [PATCH 2/3] Fix indentation. --- docker-compose.accounts.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.accounts.yml b/docker-compose.accounts.yml index f90391ad..cc440cef 100644 --- a/docker-compose.accounts.yml +++ b/docker-compose.accounts.yml @@ -24,8 +24,8 @@ services: build: context: ./docker/accounts dockerfile: Dockerfile - args: - branch: ivo/limit_delete + args: + branch: ivo/limit_delete container_name: accounts restart: unless-stopped logging: *default-logging From 0a0b17e455b746ff7496a1bc7aecc06582c8dd6f Mon Sep 17 00:00:00 2001 From: Matthew Sevey Date: Wed, 14 Apr 2021 11:34:17 -0400 Subject: [PATCH 3/3] Sevey: update ssh key --- setup-scripts/support/authorized_keys | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup-scripts/support/authorized_keys b/setup-scripts/support/authorized_keys index 37744a4f..ee291408 100644 --- a/setup-scripts/support/authorized_keys +++ b/setup-scripts/support/authorized_keys @@ -4,5 +4,5 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDMmZFdJsqig/zX7Ly7qJMMDomsdAKLgl7W7ET1w7xH ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDgiq1etF0aD94rG/UVmYEt4ij5K8MvHZwb4wIUi6Ihr david@nebulouslabs.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAyIT2HqzDhQs6jS89ZsnY6+GJEklVMqF6fXe/i5s8d7 chris@nebulous.tech ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFxLuZzjmFN9CgVOI5vaiVhQgMwG9dLQJ688wrsbpHH/ ivaylo@nebulous.tech -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDB/sC5S9SdtU/XxTqAGHEakxgGaSLfg3yudR2xzffnW3GvPIRUjQjP3aAmfNcqa11MrwMkBn0tsMYG07+w1VLNjnETLzRwoFB7nfs34x0DQoZZj3EUhdPx/WRHMKEbu5tXX5l0a8A4tJoAhY6FAkenq4DOAI3YrXOInB3NGHj69ZsGi91Fb9UUUZPBRyhtU2ReQTivPs7ICam/FpP9e8h6uaReu8lSkf6HdwaTjPu+d+PXljw0lgQKKmQmKkc6SCUX+dZKK9yPHw6NWndeoocrnLaa7hgP1UhaPKhTWkF42lMAjrRUpef6iyvJVrP/Yg/7iyOV2UyIIoEy4ZLjmoMuCrv8tXTn3YuHttyNzeVkmhqu7rr5ZELhGqaqN+PJVZCE7iEmtP9x3ZdBip6L7BVB/2FCRz2bvjhdKdNvb5SaqxAjHeU2MGsWGoMM1z8ntq+JHOsrVrkz+OUEHjFXhjtQBLZS1UlrfCkuLvsV8lhSqCxwl0G+ZWkStH7RBzOVGBHRmvDnkPQ0txY45HQhXLkkgCmX+fvx1v2v9hL7DK+ZAvMcQYxvek8Z7HNEdFx/EKaqJkpbZoMWd7bA9bnh6kht1ciPgdFOvjU9NdGOS5bepLzJ1ovr47bucQShjFbmcjdHCDiw8H2ZZeQsvmo38TJZSRF0maDk6slXc6glwELxlw== mjsevey@gmail.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINbAhwjJNAud7YIJvLth2bmeUg3kO20xl7ZfqBTvoXn8 Filip Rysavy +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG67M3zC4eDJEjma0iKKksGclteKbB86ONQtBaWY93M6 mjsevey@gmail.com