Adding ARM64 support

.circleci/config.yml

@@ -5,7 +5,7 @@ cache_key: &cache_key tb-deps-20200924-{{ checksum "go.sum" }}
 jobs:
   lint-build-test:
     docker:
-      - image: cimg/go:1.14
+      - image: cimg/go:1.16
     steps:
       - checkout
       - restore_cache:

.goreleaser.yml

@@ -17,6 +17,7 @@ builds:
       - linux
     goarch:
       - amd64
+      - arm64
     hooks:
       post: go run scripts/post-build/main.go
 

compose/compose.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/TouchBistro/tb/service"
 	"github.com/pkg/errors"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 )
 
 type composeBuild struct {

compose/compose_test.go

@@ -99,48 +99,48 @@ func TestCreateComposeFile(t *testing.T) {
 
 version: "3.7"
 services:
-  examplezone-tb-registry-postgres:
-    container_name: examplezone-tb-registry-postgres
-    environment:
-      POSTGRES_PASSWORD: password
-      POSTGRES_USER: user
-    image: postgres:12
-    ports:
-    - 5432:5432
-    volumes:
-    - postgres:/var/lib/postgresql/data
-  touchbistro-tb-registry-postgres:
-    container_name: touchbistro-tb-registry-postgres
-    environment:
-      DB_PASSWORD: localdev
-      DB_USER: core
-    image: postgres:10.6-alpine
-    ports:
-    - 5432:5432
-    volumes:
-    - postgres:/var/lib/postgresql/data
-  touchbistro-tb-registry-venue-core-service:
-    build:
-      args:
-        NODE_ENV: development
-        NPM_TOKEN: $NPM_TOKEN
-      context: .tb/repos/TouchBistro/venue-core-service
-      target: dev
-    command: yarn start
-    container_name: touchbistro-tb-registry-venue-core-service
-    depends_on:
-    - touchbistro-tb-registry-postgres
-    env_file:
-    - .tb/repos/TouchBistro/venue-core-service/.env.example
-    environment:
-      DB_HOST: touchbistro-tb-registry-postgres
-      HTTP_PORT: "8080"
-    ports:
-    - 8081:8080
-    volumes:
-    - .tb/repos/TouchBistro/venue-core-service:/home/node/app:delegated
+    examplezone-tb-registry-postgres:
+        container_name: examplezone-tb-registry-postgres
+        environment:
+            POSTGRES_PASSWORD: password
+            POSTGRES_USER: user
+        image: postgres:12
+        ports:
+            - 5432:5432
+        volumes:
+            - postgres:/var/lib/postgresql/data
+    touchbistro-tb-registry-postgres:
+        container_name: touchbistro-tb-registry-postgres
+        environment:
+            DB_PASSWORD: localdev
+            DB_USER: core
+        image: postgres:10.6-alpine
+        ports:
+            - 5432:5432
+        volumes:
+            - postgres:/var/lib/postgresql/data
+    touchbistro-tb-registry-venue-core-service:
+        build:
+            args:
+                NODE_ENV: development
+                NPM_TOKEN: $NPM_TOKEN
+            context: .tb/repos/TouchBistro/venue-core-service
+            target: dev
+        command: yarn start
+        container_name: touchbistro-tb-registry-venue-core-service
+        depends_on:
+            - touchbistro-tb-registry-postgres
+        env_file:
+            - .tb/repos/TouchBistro/venue-core-service/.env.example
+        environment:
+            DB_HOST: touchbistro-tb-registry-postgres
+            HTTP_PORT: "8080"
+        ports:
+            - 8081:8080
+        volumes:
+            - .tb/repos/TouchBistro/venue-core-service:/home/node/app:delegated
 volumes:
-  postgres: null
+    postgres: null
 `
 
 	buf := &bytes.Buffer{}

go.mod

@@ -1,38 +1,20 @@
 module github.com/TouchBistro/tb
 
-go 1.14
+go 1.16
 
 require (
-	github.com/Microsoft/go-winio v0.4.16 // indirect
 	github.com/TouchBistro/goutils v0.1.0
-	github.com/aws/aws-sdk-go-v2 v1.0.0
-	github.com/aws/aws-sdk-go-v2/config v1.0.0
-	github.com/aws/aws-sdk-go-v2/service/ecr v1.0.0
-	github.com/aws/aws-sdk-go-v2/service/s3 v1.0.0
+	github.com/aws/aws-sdk-go-v2 v1.7.1
+	github.com/aws/aws-sdk-go-v2/config v1.5.0
+	github.com/aws/aws-sdk-go-v2/service/ecr v1.4.1
+	github.com/aws/aws-sdk-go-v2/service/s3 v1.11.1
 	github.com/blang/semver v3.5.1+incompatible
-	github.com/containerd/containerd v1.4.3 // indirect
-	github.com/docker/distribution v2.7.1+incompatible // indirect
-	github.com/docker/docker v20.10.6+incompatible
+	github.com/containerd/containerd v1.5.5 // indirect
+	github.com/docker/docker v20.10.7+incompatible
 	github.com/docker/go-connections v0.4.0 // indirect
-	github.com/docker/go-units v0.4.0 // indirect
-	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/protobuf v1.4.3 // indirect
-	github.com/gorilla/mux v1.8.0 // indirect
-	github.com/moby/term v0.0.0-20201216013528-df9cb8a40635 // indirect
-	github.com/morikuni/aec v1.0.0 // indirect
-	github.com/opencontainers/go-digest v1.0.0 // indirect
-	github.com/opencontainers/image-spec v1.0.1 // indirect
 	github.com/pkg/errors v0.9.1
-	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/sirupsen/logrus v1.7.0
-	github.com/spf13/cobra v1.1.1
-	github.com/stretchr/testify v1.5.1
-	golang.org/x/net v0.0.0-20210119194325-5f4716e94777 // indirect
-	golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c // indirect
-	golang.org/x/text v0.3.5 // indirect
-	google.golang.org/genproto v0.0.0-20210126160654-44e461bb6506 // indirect
-	google.golang.org/grpc v1.35.0 // indirect
-	gopkg.in/yaml.v2 v2.4.0
+	github.com/sirupsen/logrus v1.8.1
+	github.com/spf13/cobra v1.2.1
+	github.com/stretchr/testify v1.7.0 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
-	gotest.tools/v3 v3.0.3 // indirect
 )