From e8d270193727124e990b4be9c7fefa405d5026a7 Mon Sep 17 00:00:00 2001 From: David Zhao Date: Sun, 28 Feb 2021 22:54:50 -0800 Subject: [PATCH] release :latest docker images --- deploy/aws-ecs/config.tf | 2 +- deploy/aws-ecs/main.tf | 5 +++++ magefile.go | 28 +++++++++++++++++++++++++++- 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/deploy/aws-ecs/config.tf b/deploy/aws-ecs/config.tf index e9ab9b391..e1175123b 100644 --- a/deploy/aws-ecs/config.tf +++ b/deploy/aws-ecs/config.tf @@ -24,7 +24,7 @@ locals { task_config = [{ name = "livekit" - image = "livekit/livekit-server:networktest" + image = "livekit/livekit-server:${var.livekit_version}" cpu = 1024 memory = 1024 essential = true diff --git a/deploy/aws-ecs/main.tf b/deploy/aws-ecs/main.tf index a0fdc5d3e..94edcc6e9 100644 --- a/deploy/aws-ecs/main.tf +++ b/deploy/aws-ecs/main.tf @@ -60,6 +60,11 @@ variable "security_groups" { } # livekit config +variable "livekit_version" { + type = string + default = "latest" +} + variable "http_port" { type = number default = 7880 diff --git a/magefile.go b/magefile.go index df9b6bf41..06846afb7 100644 --- a/magefile.go +++ b/magefile.go @@ -21,6 +21,7 @@ import ( const ( goChecksumFile = ".checksumgo" + imageName = "livekit/livekit-server" ) // Default target to run when none is specified @@ -141,7 +142,32 @@ func Build() error { // builds docker image for LiveKit server func Docker() error { mg.Deps(Proto, generateWire) - cmd := exec.Command("docker", "build", ".", "-t", "livekit/livekit-server:v"+version.Version) + cmd := exec.Command("docker", "build", ".", "-t", fmt.Sprintf("%s:v%s", imageName, version.Version)) + connectStd(cmd) + if err := cmd.Run(); err != nil { + return err + } + return nil +} + +func PublishDocker() error { + mg.Deps(Docker) + + versionImg := fmt.Sprintf("%s:v%s", imageName, version.Version) + cmd := exec.Command("docker", "push", versionImg) + connectStd(cmd) + if err := cmd.Run(); err != nil { + return err + } + + latestImg := imageName + ":latest" + cmd = exec.Command("docker", "tag", versionImg, latestImg) + connectStd(cmd) + if err := cmd.Run(); err != nil { + return err + } + + cmd = exec.Command("docker", "push", latestImg) connectStd(cmd) if err := cmd.Run(); err != nil { return err