Skip to content
This repository has been archived by the owner on Feb 10, 2025. It is now read-only.

Commit

Permalink
chore: bump go version
Browse files Browse the repository at this point in the history
Signed-off-by: marcin.janas <[email protected]>
  • Loading branch information
marcin-janas committed Apr 5, 2022
1 parent 86b692a commit fef9c81
Show file tree
Hide file tree
Showing 6 changed files with 137 additions and 297 deletions.
10 changes: 4 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
FROM golang:1.11.0-alpine3.8 AS golang-build
FROM golang:1.18-alpine AS golang-build

RUN mkdir -p /go/src/github.com/AirHelp/rabbit-amazon-forwarder
WORKDIR /go/src/github.com/AirHelp/rabbit-amazon-forwarder

RUN apk --no-cache add git && go get -u github.com/golang/dep/cmd/dep

COPY Gopkg.toml Gopkg.lock ./
RUN dep ensure -v -vendor-only
RUN apk --no-cache add git

COPY . .
RUN go mod tidy -go=1.18 -compat=1.18

RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o rabbit-amazon-forwarder .

FROM alpine:3.8
FROM alpine

RUN mkdir -p /config
RUN mkdir -p /certs
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile-test
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM golang:1.11.0-alpine3.8
FROM golang:1.18-alpine

WORKDIR /go/src/github.com/AirHelp/rabbit-amazon-forwarder

RUN apk --no-cache add git gcc musl-dev && go get -u github.com/golang/dep/cmd/dep
RUN apk --no-cache add git gcc musl-dev

COPY Gopkg.toml Gopkg.lock ./
RUN dep ensure -v -vendor-only
COPY go.mod go.sum ./
RUN go mod tidy -go=1.18 -compat=1.18

COPY . .
241 changes: 0 additions & 241 deletions Gopkg.lock

This file was deleted.

46 changes: 0 additions & 46 deletions Gopkg.toml

This file was deleted.

22 changes: 22 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
module github.com/AirHelp/rabbit-amazon-forwarder

go 1.18

require (
github.com/aws/aws-sdk-go v1.43.32
github.com/onsi/ginkgo v1.16.5
github.com/onsi/gomega v1.19.0
github.com/sirupsen/logrus v1.8.1
github.com/streadway/amqp v1.0.0
)

require (
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/nxadm/tail v1.4.8 // indirect
golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
golang.org/x/text v0.3.7 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
)
Loading

0 comments on commit fef9c81

Please sign in to comment.