From 87d358f84bb7b8be10a12208abcea110486f717e Mon Sep 17 00:00:00 2001 From: sbansla Date: Tue, 6 Aug 2024 12:11:15 +0530 Subject: [PATCH 01/15] chore: test --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 09f21116..d0ac1289 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG version=latest +ARG version=1.20.10 FROM golang:$version ENV GO111MODULE 'off' From ed3c4f1cb490e7fa1c7e7f598c4ec106fe99a7f0 Mon Sep 17 00:00:00 2001 From: sbansla Date: Tue, 6 Aug 2024 12:15:36 +0530 Subject: [PATCH 02/15] chore: Empty-Commit From 85b510d1c95dadb2ba2b12874564fff51808e9c8 Mon Sep 17 00:00:00 2001 From: sbansla Date: Tue, 6 Aug 2024 12:25:05 +0530 Subject: [PATCH 03/15] c1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d0ac1289..09f21116 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG version=1.20.10 +ARG version=latest FROM golang:$version ENV GO111MODULE 'off' From 9d154cc20fe4cdc80a588eb88d408346cd977dbe Mon Sep 17 00:00:00 2001 From: sbansla Date: Tue, 6 Aug 2024 13:04:12 +0530 Subject: [PATCH 04/15] c1 --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 09f21116..7c18f05f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,4 @@ -ARG version=latest -FROM golang:$version +FROM golang:1.20.10 ENV GO111MODULE 'off' From 5ec9b4b8006d0a7f33693150dfbcfb0d87408c3f Mon Sep 17 00:00:00 2001 From: sbansla Date: Tue, 6 Aug 2024 13:07:26 +0530 Subject: [PATCH 05/15] c1 --- .github/workflows/test-and-deploy.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/test-and-deploy.yml b/.github/workflows/test-and-deploy.yml index f447a23c..bd769187 100644 --- a/.github/workflows/test-and-deploy.yml +++ b/.github/workflows/test-and-deploy.yml @@ -35,6 +35,11 @@ jobs: uses: actions/setup-go@v2 with: go-version: ${{ matrix.go }} + # Set up Docker Compose + - name: Set up Docker Compose + uses: docker/compose-action@v2 + with: + version: '2.15.0' # Use the latest version or specify the required version - name: Set Go env vars run: | From 0ad87d593c9191b6e72229d30d4af66a222a356e Mon Sep 17 00:00:00 2001 From: sbansla Date: Tue, 6 Aug 2024 13:10:49 +0530 Subject: [PATCH 06/15] c1 --- .github/workflows/test-and-deploy.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test-and-deploy.yml b/.github/workflows/test-and-deploy.yml index bd769187..a6ea7780 100644 --- a/.github/workflows/test-and-deploy.yml +++ b/.github/workflows/test-and-deploy.yml @@ -35,18 +35,17 @@ jobs: uses: actions/setup-go@v2 with: go-version: ${{ matrix.go }} - # Set up Docker Compose - - name: Set up Docker Compose - uses: docker/compose-action@v2 - with: - version: '2.15.0' # Use the latest version or specify the required version - name: Set Go env vars run: | echo "GOPATH=$HOME" >> $GITHUB_ENV echo "GOBIN=$HOME/bin" >> $GITHUB_ENV echo "GO111MODULE=off" >> $GITHUB_ENV - + + - name: Install Docker Compose + run: | + sudo apt-get update + sudo apt-get install -y docker-compose - name: Run Tests run: make test-docker From 2d6b6a4ac965855829dc23c3e83f00dc8f4f197a Mon Sep 17 00:00:00 2001 From: sbansla Date: Tue, 6 Aug 2024 13:15:23 +0530 Subject: [PATCH 07/15] c1 --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 3154774a..d703157e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (C) 2023, Twilio SendGrid, Inc. +Copyright (C) 2024, Twilio SendGrid, Inc. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in From ba9b24b5fac0d33bbca5d3b94ceeaea06cc83069 Mon Sep 17 00:00:00 2001 From: sbansla Date: Tue, 6 Aug 2024 14:42:37 +0530 Subject: [PATCH 08/15] c1 --- .github/workflows/test-and-deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-and-deploy.yml b/.github/workflows/test-and-deploy.yml index a6ea7780..d7859ea2 100644 --- a/.github/workflows/test-and-deploy.yml +++ b/.github/workflows/test-and-deploy.yml @@ -38,8 +38,8 @@ jobs: - name: Set Go env vars run: | - echo "GOPATH=$HOME" >> $GITHUB_ENV - echo "GOBIN=$HOME/bin" >> $GITHUB_ENV + echo "GOPATH=/go" >> $GITHUB_ENV + echo "GOBIN=/go/bin" >> $GITHUB_ENV echo "GO111MODULE=off" >> $GITHUB_ENV - name: Install Docker Compose From 5d0b5c91c5fc0796426cc9ea1cf4c119dd9da783 Mon Sep 17 00:00:00 2001 From: sbansla Date: Tue, 6 Aug 2024 14:45:17 +0530 Subject: [PATCH 09/15] x1 --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7c18f05f..33388fff 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,6 @@ -FROM golang:1.20.10 - +ARG version=latest +FROM golang:$version +x`xw ENV GO111MODULE 'off' COPY prism/prism/nginx/cert.crt /usr/local/share/ca-certificates/cert.crt From a85d7e35854d8614f5a7c0c4718d1c675b13e699 Mon Sep 17 00:00:00 2001 From: sbansla Date: Tue, 6 Aug 2024 14:47:16 +0530 Subject: [PATCH 10/15] x1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 33388fff..09f21116 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ ARG version=latest FROM golang:$version -x`xw + ENV GO111MODULE 'off' COPY prism/prism/nginx/cert.crt /usr/local/share/ca-certificates/cert.crt From 937405b932476488dc90114b5c5401f10ca4b4cd Mon Sep 17 00:00:00 2001 From: sbansla Date: Tue, 6 Aug 2024 14:49:52 +0530 Subject: [PATCH 11/15] c1 --- .github/workflows/test-and-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-and-deploy.yml b/.github/workflows/test-and-deploy.yml index d7859ea2..578cdc43 100644 --- a/.github/workflows/test-and-deploy.yml +++ b/.github/workflows/test-and-deploy.yml @@ -39,7 +39,7 @@ jobs: - name: Set Go env vars run: | echo "GOPATH=/go" >> $GITHUB_ENV - echo "GOBIN=/go/bin" >> $GITHUB_ENV + echo "GOBIN=/bin" >> $GITHUB_ENV echo "GO111MODULE=off" >> $GITHUB_ENV - name: Install Docker Compose From ffd9226e1cd1b437e246c6c80cc625546939054f Mon Sep 17 00:00:00 2001 From: sbansla Date: Tue, 6 Aug 2024 14:54:53 +0530 Subject: [PATCH 12/15] c1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 09f21116..3b81b900 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ ENV GO111MODULE 'off' COPY prism/prism/nginx/cert.crt /usr/local/share/ca-certificates/cert.crt RUN update-ca-certificates - +RUN mkdir /bin WORKDIR /go/src/github.com/sendgrid/sendgrid-go COPY . . From 76d77ffd0866fc893e653bbf82ec9b3c150df491 Mon Sep 17 00:00:00 2001 From: sbansla Date: Tue, 6 Aug 2024 15:17:42 +0530 Subject: [PATCH 13/15] c1 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3b81b900..d0ac1289 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,11 @@ -ARG version=latest +ARG version=1.20.10 FROM golang:$version ENV GO111MODULE 'off' COPY prism/prism/nginx/cert.crt /usr/local/share/ca-certificates/cert.crt RUN update-ca-certificates -RUN mkdir /bin + WORKDIR /go/src/github.com/sendgrid/sendgrid-go COPY . . From 4e672916c9af8b5063086363c0d1e11cc1397718 Mon Sep 17 00:00:00 2001 From: sbansla Date: Tue, 6 Aug 2024 15:19:48 +0530 Subject: [PATCH 14/15] c1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d0ac1289..a5eedb5e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ ARG version=1.20.10 -FROM golang:$version +FROM golang:1.20.10 ENV GO111MODULE 'off' From 0e7eb65ff6346d811b296a6442a149d63538f45e Mon Sep 17 00:00:00 2001 From: sbansla Date: Tue, 6 Aug 2024 15:21:48 +0530 Subject: [PATCH 15/15] c1 --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index a5eedb5e..5b17ca24 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,4 @@ -ARG version=1.20.10 -FROM golang:1.20.10 +FROM golang:1.21.11 ENV GO111MODULE 'off'