Skip to content

Commit

Permalink
Revert "[BREAKING-CHANGES] security updates needs at least go version…
Browse files Browse the repository at this point in the history
… >=17 with security updates (#12)"

This reverts commit 50918fd.
  • Loading branch information
gritzkoo committed Jun 1, 2022
1 parent 50918fd commit 37a1367
Show file tree
Hide file tree
Showing 6 changed files with 77 additions and 55 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
strategy:
matrix:
redis-version: [4, 5, 6]
go: ["1.17", "1.18"]
go: ["1.14", "1.15", "1.16", "1.17", "1.18"]
steps:
- uses: actions/checkout@v2
- name: Sets up a Memcached server
Expand Down Expand Up @@ -48,4 +48,4 @@ jobs:
steps:
- uses: rymndhng/release-on-push-action@master
with:
bump_version_scheme: patch
bump_version_scheme: minor
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ services:
- memcached

go:
- 1.17.x
- 1.18.x
- 1.14.x
- 1.15.x
- tip

matrix:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.18-alpine
FROM golang:1.15

WORKDIR /go/src/app
COPY . .
Expand Down
26 changes: 13 additions & 13 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,30 @@ version: "3.7"

services:
test:
&default
container_name: golang_app
image: golang:1.18-alpine
working_dir: /app
command: sh -c "go test -v ./..."
environment:
- CGO_ENABLED=0
- GOOS=linux
build:
context: .
command: go test ./...
volumes:
- .:/app
- godir:/go
- .:/go/src/app
ports:
- 8888:8888
depends_on:
- redis
- memcache

app:
<<: *default
container_name: golang_app
build:
context: .
command: go run main.go
volumes:
- .:/go/src/app
ports:
- 8888:8888
depends_on:
- redis
- memcache

redis:
image: redis
Expand All @@ -37,6 +40,3 @@ services:
networks:
default:
name: gritzkoo-golang-health-checker

volumes:
godir: {}
28 changes: 8 additions & 20 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,34 +1,22 @@
module github.com/gritzkoo/golang-health-checker

go 1.18
go 1.16

require (
github.com/bradfitz/gomemcache v0.0.0-20220106215444-fb4bf637b56d
github.com/gin-gonic/gin v1.8.0
github.com/go-redis/redis v6.15.9+incompatible
golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e
gopkg.in/go-playground/assert.v1 v1.2.1
)

require (
github.com/gin-contrib/sse v0.1.0 // indirect
github.com/go-playground/locales v0.14.0 // indirect
github.com/go-playground/universal-translator v0.18.0 // indirect
github.com/gin-gonic/gin v1.7.7
github.com/go-playground/validator/v10 v10.11.0 // indirect
github.com/goccy/go-json v0.9.7 // indirect
github.com/go-redis/redis v6.15.9+incompatible
github.com/golang/protobuf v1.5.2 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/leodido/go-urn v1.2.1 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/onsi/ginkgo v1.16.5 // indirect
github.com/onsi/gomega v1.19.0 // indirect
github.com/pelletier/go-toml/v2 v2.0.1 // indirect
github.com/ugorji/go/codec v1.2.7 // indirect
golang.org/x/net v0.0.0-20220526153639-5463443f8c37 // indirect
github.com/stretchr/testify v1.7.1 // indirect
github.com/ugorji/go v1.2.7 // indirect
golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
golang.org/x/text v0.3.7 // indirect
google.golang.org/protobuf v1.28.0 // indirect
gopkg.in/go-playground/assert.v1 v1.2.1
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading

0 comments on commit 37a1367

Please sign in to comment.