Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
sudo: required
dist: focal

language: go
go:
- 1.12.6

go_import_path: github.com/frodenas/gcs-resource

Expand Down Expand Up @@ -38,14 +41,9 @@ jobs:
DOCKER_IMAGE_TAG=$TRAVIS_PULL_REQUEST_BRANCH
fi
fi
- make docker DOCKER_IMAGE_NAME=$DOCKER_IMAGE_NAME DOCKER_IMAGE_TAG=$DOCKER_IMAGE_TAG
- |
if [[ "$TRAVIS_TAG" =~ ^v[0-9]+(\.[0-9]+){2}$ ]]; then
docker tag "$DOCKER_IMAGE_NAME:$TRAVIS_TAG" "$DOCKER_IMAGE_NAME:latest"
fi
- docker images
- |
if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
docker push $DOCKER_IMAGE_NAME
"$DOCKER_IMAGE_TAG"="latest"
fi
- docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
- make docker DOCKER_IMAGE_NAME=$DOCKER_IMAGE_NAME DOCKER_IMAGE_TAG=$DOCKER_IMAGE_TAG 2>/dev/null
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:alpine as builder
FROM golang:1.15.10-alpine as builder
COPY . /go/src/github.com/frodenas/gcs-resource
ENV CGO_ENABLED 0
RUN go build -o /assets/in github.com/frodenas/gcs-resource/cmd/in
Expand Down
7 changes: 6 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,12 @@ integration-tests: deps
@$(GINKGO) -r -p integration

docker:
mkdir -vp ~/.docker/cli-plugins/
curl --silent -L "https://github.com/docker/buildx/releases/download/v0.4.2/buildx-v0.4.2.linux-amd64" > ~/.docker/cli-plugins/docker-buildx
chmod a+x ~/.docker/cli-plugins/docker-buildx
@echo ">> building docker image"
@docker build -t "$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG)" .
@docker run --rm --privileged docker/binfmt:66f9012c56a8316f9244ffd7622d7c21c1f6f28d
@docker buildx create --use --name mybuilder
@docker buildx build --platform linux/amd64,linux/arm64 -t $(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG) -t $(DOCKER_IMAGE_NAME):latest --push .

.PHONY: default deps format style vet build unit-tests integration-tests docker