Skip to content
This repository was archived by the owner on Dec 2, 2020. It is now read-only.

Commit 5239ce2

Browse files
committed
Add docker make targets to Travis build
Use golang 1.13 for all targets
1 parent b247952 commit 5239ce2

File tree

3 files changed

+18
-13
lines changed

3 files changed

+18
-13
lines changed

.travis.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,8 @@ script:
1414
- make
1515
- make integration-test
1616
- make stage-release-binaries
17+
- make clean
18+
- make docker-build
19+
- make docker-test
20+
- make clean
21+
- docker build -t img2lambda .

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
22
# SPDX-License-Identifier: MIT-0
33

4-
FROM golang:1.12 AS builder
4+
FROM golang:1.13 AS builder
55

66
WORKDIR /go/src/github.com/awslabs/aws-lambda-container-image-converter
77

Makefile

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,26 +47,26 @@ windows-build: $(WINDOWS_BINARY)
4747

4848
.PHONY: docker-build
4949
docker-build:
50-
docker run -v $(shell pwd):/usr/src/app/src/github.com/awslabs/img2lambda \
51-
--workdir=/usr/src/app/src/github.com/awslabs/img2lambda \
50+
docker run -v $(shell pwd):/usr/src/app/src/github.com/awslabs/aws-lambda-container-image-converter \
51+
--workdir=/usr/src/app/src/github.com/awslabs/aws-lambda-container-image-converter \
5252
--env GOPATH=/usr/src/app \
53-
golang:1.11 make $(LINUX_BINARY)
54-
docker run -v $(shell pwd):/usr/src/app/src/github.com/awslabs/img2lambda \
55-
--workdir=/usr/src/app/src/github.com/awslabs/img2lambda \
53+
golang:1.13 make $(LINUX_BINARY)
54+
docker run -v $(shell pwd):/usr/src/app/src/github.com/awslabs/aws-lambda-container-image-converter \
55+
--workdir=/usr/src/app/src/github.com/awslabs/aws-lambda-container-image-converter \
5656
--env GOPATH=/usr/src/app \
57-
golang:1.11 make $(DARWIN_BINARY)
58-
docker run -v $(shell pwd):/usr/src/app/src/github.com/awslabs/img2lambda \
59-
--workdir=/usr/src/app/src/github.com/awslabs/img2lambda \
57+
golang:1.13 make $(DARWIN_BINARY)
58+
docker run -v $(shell pwd):/usr/src/app/src/github.com/awslabs/aws-lambda-container-image-converter \
59+
--workdir=/usr/src/app/src/github.com/awslabs/aws-lambda-container-image-converter \
6060
--env GOPATH=/usr/src/app \
61-
golang:1.11 make $(WINDOWS_BINARY)
61+
golang:1.13 make $(WINDOWS_BINARY)
6262

6363
.PHONY: docker-test
6464
docker-test:
65-
docker run -v $(shell pwd):/usr/src/app/src/github.com/awslabs/img2lambda \
66-
--workdir=/usr/src/app/src/github.com/awslabs/img2lambda \
65+
docker run -v $(shell pwd):/usr/src/app/src/github.com/awslabs/aws-lambda-container-image-converter \
66+
--workdir=/usr/src/app/src/github.com/awslabs/aws-lambda-container-image-converter \
6767
--env GOPATH=/usr/src/app \
6868
--env IMG_TOOL_RELEASE=$(IMG_TOOL_RELEASE) \
69-
golang:1.11 make
69+
golang:1.13 make
7070

7171
.PHONY: stage-release-binaries
7272
stage-release-binaries: $(LINUX_BINARY) $(DARWIN_BINARY) $(WINDOWS_BINARY)

0 commit comments

Comments
 (0)