Skip to content

Commit 85ea169

Browse files
kimxoguscmattoon
authored andcommitted
go 1.13, use go modules
1 parent 8cd493e commit 85ea169

11 files changed

+150
-573
lines changed

.codecov.yml

-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,3 @@ ignore:
22
- "scripts"
33
- "build"
44
- ".*_test.go"
5-

.dockerignore

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ build/**
55
examples/**
66
scripts/**
77
terraform/**
8-
vendor/**
98

109
CHANGELOG.md
1110
CODE_OF_CONDUCT.md

.travis.yml

+33-34
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,49 @@
11
language: go
22
go:
3-
- '1.10'
3+
- "1.13.x"
44
before_install:
5-
- go get -t -v ./...
6-
- "./scripts/go_test.sh"
5+
- go get -t -v ./...
6+
- "./scripts/go_test.sh"
77
jobs:
88
include:
9-
- stage: make-build
10-
script:
11-
- make build
12-
- stage: docker-latest
13-
script:
14-
- docker build -t cmattoon/aws-ssm:dev .
15-
- docker tag cmattoon/aws-ssm:dev cmattoon/aws-ssm:latest
16-
- echo "$DOCKER_PASSWD" | docker login --username "$DOCKER_USER" --password-stdin
17-
- docker push cmattoon/aws-ssm:dev
18-
- docker push cmattoon/aws-ssm:latest
19-
- stage: docker-branch
20-
script:
21-
- docker build -t cmattoon/aws-ssm:$TRAVIS_BRANCH .
22-
- echo "$DOCKER_PASSWD" | docker login --username "$DOCKER_USER" --password-stdin
23-
- docker push cmattoon/aws-ssm:$TRAVIS_BRANCH
24-
- stage: docker-pr
25-
script:
26-
- docker build -t cmattoon/aws-ssm:PR-$TRAVIS_PULL_REQUEST .
27-
- echo "$DOCKER_PASSWD" | docker login --username "$DOCKER_USER" --password-stdin
28-
- docker push cmattoon/aws-ssm:PR-$TRAVIS_PULL_REQUEST
9+
- stage: make-build
10+
script:
11+
- make build
12+
- stage: docker-latest
13+
script:
14+
- docker build -t cmattoon/aws-ssm:dev .
15+
- docker tag cmattoon/aws-ssm:dev cmattoon/aws-ssm:latest
16+
- echo "$DOCKER_PASSWD" | docker login --username "$DOCKER_USER" --password-stdin
17+
- docker push cmattoon/aws-ssm:dev
18+
- docker push cmattoon/aws-ssm:latest
19+
- stage: docker-branch
20+
script:
21+
- docker build -t cmattoon/aws-ssm:$TRAVIS_BRANCH .
22+
- echo "$DOCKER_PASSWD" | docker login --username "$DOCKER_USER" --password-stdin
23+
- docker push cmattoon/aws-ssm:$TRAVIS_BRANCH
24+
- stage: docker-pr
25+
script:
26+
- docker build -t cmattoon/aws-ssm:PR-$TRAVIS_PULL_REQUEST .
27+
- echo "$DOCKER_PASSWD" | docker login --username "$DOCKER_USER" --password-stdin
28+
- docker push cmattoon/aws-ssm:PR-$TRAVIS_PULL_REQUEST
2929
branches:
3030
only:
31-
- master
32-
- "/^v.*$/"
31+
- master
32+
- "/^v.*$/"
3333
stages:
34-
- name: make-build
35-
- name: docker-latest
36-
if: branch = master AND type != pull_request
37-
- name: docker-branch
38-
if: branch != master AND type != pull_request
39-
- name: docker-pr
40-
if: type == pull_request
34+
- name: make-build
35+
- name: docker-latest
36+
if: branch = master AND type != pull_request
37+
- name: docker-branch
38+
if: branch != master AND type != pull_request
39+
- name: docker-pr
40+
if: type == pull_request
4141
after_success:
42-
- bash <(curl -s https://codecov.io/bash)
42+
- bash <(curl -s https://codecov.io/bash)
4343
deploy:
4444
provider: releases
4545
api_key:
4646
secure: LOwlKUR14QSuaf1g4m3NvIzIT8GxOPCosIDoUg8uCptp+sIIzalVnaLz7ulw+yyMzxvtPz5X7HezZ3vN84qWWdFezkc7pdgCHw2n9e6dLyWNTSLKi5MOrCcXEfhhd3odepvtQeFu+2vV5iJ/OTwdCdceV37gCreDLCm8V4bpBp8glSHafBaPNvJDPz4GnbC7a8Bj+IuyQe1heiFhbOe6kCqElfq/BJVxcRGB3qukyXQwUcj0Um+qMaMqRVMj973ZcahtzpWXNTu9jfE3mZKeeWfDd9sFJ8uCPPPJp9EwhIEeiG1TsCOR2vGpjeamQbI0f0f4n8dxFRDG+YtRwopSYJgGUnUEPxI+3V6lSN3f+dtMIwa1lbupbC1IW8U3s21NyEcEqBwXWYm+72G5X20RrKjKEUfKv9bzZbK61qztLx+D5i0vCv9oeIA1MF/tIybrHgCrw5VR4/SlxYZHYdFfNK/coZp/E6hICosMmuURmvPVAQ9h8IZVJWzOiXnUUszLPYwSmc+vih5JVJxqvHyu6H0cnCuiRPCeGCBD8Re95lCKYrB2vcw+mUZjcF9UYYh2Vf9BnduJE83M/O8pp6bc6CgadDXcDQ51vQzSl53cH8q+xPQN29JrKaNaOQ3F9zrWA70FGnyjecmgm+k5j9V/63jhUuRgoLFq9k/+b9GzYqo=
4747
file: build/aws-ssm
4848
on:
4949
tags: true
50-

Dockerfile

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,22 @@
11
###
22
## Stage I - Build aws-ssm binary, install aws-iam-authenticator
33
#
4-
FROM library/golang:1.10-alpine
4+
FROM library/golang:1.13-alpine
55

66
RUN apk add --update --no-cache git
77

88
WORKDIR /go/src/github.com/cmattoon/aws-ssm
99

1010
COPY . .
1111

12-
RUN go get -d -v ./...
13-
1412
RUN go install -v ./...
1513

16-
RUN go get -u -v github.com/kubernetes-sigs/aws-iam-authenticator/cmd/aws-iam-authenticator
14+
RUN go get -u -v sigs.k8s.io/aws-iam-authenticator/cmd/aws-iam-authenticator
1715

1816
###
1917
## Stage II - Add ca-certificates, binaries
2018
#
21-
FROM library/alpine:3.7
19+
FROM library/alpine:3.11
2220

2321
ENV AWS_REGION ""
2422
ENV AWS_ACCESS_KEY ""

0 commit comments

Comments
 (0)