Skip to content

Commit 8900711

Browse files
authored
fix image build (#37)
1 parent f1702a4 commit 8900711

2 files changed

Lines changed: 4 additions & 5 deletions

File tree

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM golang:1.16 AS gobuild
15+
FROM golang:1.20 AS gobuild
1616
WORKDIR /src
1717

1818
# cache deps before copying source so that we don't re-download as much

setuplocal.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import (
1919
"fmt"
2020
"log"
2121
"os"
22-
"time"
2322

2423
"github.com/GoogleCloudPlatform/opentelemetry-operations-e2e-testing/setuptf"
2524
"github.com/GoogleCloudPlatform/opentelemetry-operations-e2e-testing/testclient"
@@ -90,8 +89,8 @@ func SetupLocal(
9089

9190
cleanup := func() {
9291
logger.Printf("Stopping and removing container ID %v\n", containerID)
93-
timeout := (time.Second * 15)
94-
err = cli.ContainerStop(ctx, containerID, &timeout)
92+
timeout := 15
93+
err = cli.ContainerStop(ctx, containerID, container.StopOptions{Timeout: &timeout})
9594
defer removeContainer()
9695
if err != nil {
9796
logger.Panic(err)
@@ -116,7 +115,7 @@ func createContainer(
116115
args *Args,
117116
pubsubInfo *setuptf.PubsubInfo,
118117
logger *log.Logger,
119-
) (container.ContainerCreateCreatedBody, error) {
118+
) (container.CreateResponse, error) {
120119
env := []string{
121120
"PORT=" + args.Local.Port,
122121
"PROJECT_ID=" + args.ProjectID,

0 commit comments

Comments
 (0)