diff --git a/aws/imagedefinitions.json b/aws/imagedefinitions.json new file mode 100644 index 00000000..d307548f --- /dev/null +++ b/aws/imagedefinitions.json @@ -0,0 +1,6 @@ +[ + { + "name": "oef", + "imageUri": "185273882442.dkr.ecr.eu-central-1.amazonaws.com/oef:latest" + } +] diff --git a/aws/imagedefinitions.zip b/aws/imagedefinitions.zip new file mode 100644 index 00000000..023c5969 Binary files /dev/null and b/aws/imagedefinitions.zip differ diff --git a/aws/oef-pipeline.json b/aws/oef-pipeline.json new file mode 100644 index 00000000..39b5d726 --- /dev/null +++ b/aws/oef-pipeline.json @@ -0,0 +1,93 @@ +{ + "pipeline": { + "name": "oef", + "roleArn": "arn:aws:iam::185273882442:role/service-role/AWSCodePipelineServiceRole-eu-central-1-oef", + "artifactStore": { + "type": "S3", + "location": "codepipeline-eu-central-1-790111279784" + }, + "stages": [ + { + "name": "Source", + "actions": [ + { + "name": "Source", + "actionTypeId": { + "category": "Source", + "owner": "AWS", + "provider": "ECR", + "version": "1" + }, + "runOrder": 1, + "configuration": { + "ImageTag": "latest", + "RepositoryName": "oef" + }, + "outputArtifacts": [ + { + "name": "SourceArtifact" + } + ], + "inputArtifacts": [], + "region": "eu-central-1", + "namespace": "SourceVariables" + }, + { + "name": "imagedefinitions", + "actionTypeId": { + "category": "Source", + "owner": "AWS", + "provider": "S3", + "version": "1" + }, + "runOrder": 1, + "configuration": { + "PollForSourceChanges": "false", + "S3Bucket": "codepipeline-eu-central-1-790111279784", + "S3ObjectKey": "oef/SourceArti/imagedefinitions.zip" + }, + "outputArtifacts": [ + { + "name": "imagedefjson" + } + ], + "inputArtifacts": [], + "region": "eu-central-1" + } + ] + }, + { + "name": "Deploy", + "actions": [ + { + "name": "Deploy", + "actionTypeId": { + "category": "Deploy", + "owner": "AWS", + "provider": "ECS", + "version": "1" + }, + "runOrder": 1, + "configuration": { + "ClusterName": "default", + "ServiceName": "oef-service" + }, + "outputArtifacts": [], + "inputArtifacts": [ + { + "name": "imagedefjson" + } + ], + "region": "eu-central-1" + } + ] + } + ], + "version": 5 + }, + "metadata": { + "pipelineArn": "arn:aws:codepipeline:eu-central-1:185273882442:oef", + "created": "2020-02-29T11:15:29.906000+01:00", + "updated": "2020-02-29T11:39:18.093000+01:00" + } +} diff --git a/renderer/funcmap.go b/renderer/funcmap.go index b079848e..51c34bbc 100644 --- a/renderer/funcmap.go +++ b/renderer/funcmap.go @@ -95,7 +95,7 @@ func version() string { if err != nil { return "" } - return string(version) + return strings.TrimSpace(string(version)) } func toInt(value float64) int { diff --git a/templates/layout/login.html.tpl b/templates/layout/login.html.tpl index 42058533..33146005 100644 --- a/templates/layout/login.html.tpl +++ b/templates/layout/login.html.tpl @@ -37,8 +37,7 @@