Skip to content

Commit

Permalink
Merge pull request #83 from gocardless/dependabot/docker/golang-1.13.1
Browse files Browse the repository at this point in the history
Bump golang from 1.12 to 1.13.1
  • Loading branch information
lawrencejones authored Oct 1, 2019
2 parents 37a5fe8 + 3a3f5fc commit 9c89799
Showing 48 changed files with 70 additions and 11,549 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
# build
################################################################################

FROM golang:1.12 AS build
FROM golang:1.13.1 AS build
COPY . /go/src/github.com/gocardless/stolon-pgbouncer
WORKDIR /go/src/github.com/gocardless/stolon-pgbouncer

@@ -19,7 +19,7 @@ RUN set -x \
# release
################################################################################

FROM gocardless/stolon-pgbouncer-base:2019090201 AS release
FROM gocardless/stolon-pgbouncer-base:2019100101 AS release
COPY --from=build /go/src/github.com/gocardless/stolon-pgbouncer/stolon-pgbouncer /usr/local/bin/stolon-pgbouncer
USER postgres
ENTRYPOINT ["/usr/local/bin/stolon-pgbouncer"]
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -3,9 +3,9 @@ PROJECT=github.com/gocardless/stolon-pgbouncer
VERSION=$(shell git rev-parse --short HEAD)-dev
BUILD_COMMAND=go build -ldflags "-X main.Version=$(VERSION)"

BASE_TAG=2019090201
CIRCLECI_TAG=2019090201
STOLON_DEVELOPMENT_TAG=2019090201
BASE_TAG=2019100101
CIRCLECI_TAG=2019100101
STOLON_DEVELOPMENT_TAG=2019100101

.PHONY: all darwin linux test clean test-acceptance docker-compose

2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.0.0
2.0.1
2 changes: 1 addition & 1 deletion circle.yml
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ references:
docker_build_image: &docker_build_image
working_directory: /go/src/github.com/gocardless/stolon-pgbouncer
docker:
- image: &image gocardless/stolon-pgbouncer-circleci:2019090201
- image: &image gocardless/stolon-pgbouncer-circleci:2019100101
docker_postgres_build_image: &docker_postgres_build_image
working_directory: /go/src/github.com/gocardless/stolon-pgbouncer
docker:
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ services:
- etcd-store

sentinel:
image: &stolonDevelopmentImage gocardless/stolon-development:2019090201
image: &stolonDevelopmentImage gocardless/stolon-development:2019100101
restart: on-failure
depends_on:
- etcd-store
4 changes: 2 additions & 2 deletions docker/circleci/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# In addition to our base install of pgbouncer and postgresql-client, add CI
# dependencies that we require during our builds.
FROM gocardless/stolon-pgbouncer-base:2019090201
FROM gocardless/stolon-pgbouncer-base:2019100101

# General test utilities
RUN set -x \
@@ -12,7 +12,7 @@ RUN set -x \
ENV GOPATH=/go GOROOT=/usr/local/go PATH=$PATH:/usr/local/go/bin:/go/bin:/usr/sbin
RUN set -x \
&& mkdir -p /usr/local/go /go \
&& curl -L https://dl.google.com/go/go1.12.linux-amd64.tar.gz -o /tmp/go.tar.gz \
&& curl -L https://dl.google.com/go/go1.13.linux-amd64.tar.gz -o /tmp/go.tar.gz \
&& tar xfvz /tmp/go.tar.gz -C /usr/local/go --strip-components=1 \
&& go version \
&& go get -v -u github.com/onsi/ginkgo/ginkgo \
2 changes: 1 addition & 1 deletion docker/stolon-development/Dockerfile
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ RUN set -x \
# In addition to our base install of pgbouncer and postgresql-client, configure
# all the dependencies we'll need across our docker-compose setup along with
# convenience env vars to make stolon tooling function correctly.
FROM gocardless/stolon-pgbouncer-base:2019090201
FROM gocardless/stolon-pgbouncer-base:2019100101

RUN set -x \
&& apt-get update -y \

This file was deleted.

This file was deleted.

Loading

0 comments on commit 9c89799

Please sign in to comment.