MirrorMirror
/
riju
mirror of https://github.com/radian-software/riju.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Container should be able to start

This commit is contained in:
Radon Rosborough 2021-07-05 00:52:03 +00:00
parent ab61f0eb4e
commit 9c62bb3213
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
tools/jsonschema.yaml → lib/jsonschema.yaml
View File

2
lib/yaml.js
View File

@ -15,7 +15,7 @@ import YAML from "yaml";
// * we are using bash with 'set -euxo pipefail' // * we are using bash with 'set -euxo pipefail'
async function readJSONSchemaFromDisk() { async function readJSONSchemaFromDisk() {
return YAML.parse(await fs.readFile("tools/jsonschema.yaml", "utf-8"), { return YAML.parse(await fs.readFile("lib/jsonschema.yaml", "utf-8"), {
merge: true, merge: true,
}); });
} }

22
supervisor/src/main.go
View File

@ -331,7 +331,7 @@ func (sv *supervisor) reload() error {
"docker", "run", "-d", "docker", "run", "-d",
"-v", "/var/run/riju:/var/run/riju", "-v", "/var/run/riju:/var/run/riju",
"-v", "/var/run/docker.sock:/var/run/docker.sock", "-v", "/var/run/docker.sock:/var/run/docker.sock",
"-p", fmt.Sprintf("%s:6119", port), "-p", fmt.Sprintf("127.0.0.1:%d:6119", port),
"-e", "RIJU_DEPLOY_CONFIG", "-e", "RIJU_DEPLOY_CONFIG",
"-e", "ANALYTICS=1", "-e", "ANALYTICS=1",
"--name", name, "--name", name,
@ -344,7 +344,7 @@ func (sv *supervisor) reload() error {
return err return err
} }
sv.status("waiting for container to start up") sv.status("waiting for container to start up")
time.Sleep(5) time.Sleep(5 * time.Second)
sv.status("checking that container is healthy") sv.status("checking that container is healthy")
resp, err := http.Get(fmt.Sprintf("http://localhost:%d", port)) resp, err := http.Get(fmt.Sprintf("http://localhost:%d", port))
if err != nil { if err != nil {
@ -360,10 +360,10 @@ func (sv *supervisor) reload() error {
} }
sv.isGreen = !sv.isGreen sv.isGreen = !sv.isGreen
sv.status("stopping old container") sv.status("stopping old container")
dockerStop := exec.Command("docker", "stop", oldName) dockerRm := exec.Command("docker", "rm", "-f", oldName)
dockerStop.Stdout = dockerStop.Stdout dockerRm.Stdout = dockerRm.Stdout
dockerStop.Stderr = dockerStop.Stderr dockerRm.Stderr = dockerRm.Stderr
if err := dockerStop.Run(); err != nil { if err := dockerRm.Run(); err != nil {
return err return err
} }
sv.status("reload complete") sv.status("reload complete")
@ -406,7 +406,7 @@ func main() {
} }
dockerContainerLs := exec.Command( dockerContainerLs := exec.Command(
"docker", "container", "ls", "docker", "container", "ls", "-a",
"--format", "{{ .Names }}:{{ .CreatedAt }}", "--format", "{{ .Names }}:{{ .CreatedAt }}",
) )
dockerContainerLs.Stderr = os.Stderr dockerContainerLs.Stderr = os.Stderr
@ -461,10 +461,10 @@ func main() {
name = greenName name = greenName
} }
log.Printf("stopping %s container as it is newer\n", color) log.Printf("stopping %s container as it is newer\n", color)
dockerStop := exec.Command("docker", "stop", name) dockerRm := exec.Command("docker", "rm", "-f", name)
dockerStop.Stdout = os.Stdout dockerRm.Stdout = os.Stdout
dockerStop.Stderr = os.Stderr dockerRm.Stderr = os.Stderr
if err := dockerStop.Run(); err != nil { if err := dockerRm.Run(); err != nil {
log.Fatalln(err) log.Fatalln(err)
} }
} }