Merge pull request #62 from lukaszbudnik/upgrade-docker-dependencies-add-integration-test

upgraded docker containers for golang and alpine
correct bash if-then-else syntax
2023-01-08 20:39:59 +01:00 · 2023-01-08 20:36:31 +01:00 · 2023-01-08 20:33:08 +01:00 · 2023-01-08 17:43:12 +01:00 · 2023-01-05 17:01:35 +00:00 · 2022-10-28 17:47:17 +02:00
6 changed files with 25 additions and 9 deletions
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -7,6 +7,20 @@ jobs:
    runs-on: ubuntu-latest

    steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v3.3.0
      - name: Build the Docker image
-        run: docker build . --file Dockerfile --tag yosoy-local:$(date +%s)
+        run: docker build . --file Dockerfile --tag yosoy-local:latest
+      - name: Run simple integration test
+        run: |
+          docker run -p 3333:80 yosoy-local:latest > yosoy.log &
+          sleep 5
+          RESULT=$(curl -s -X DELETE -H 'x-api-key: abc123' 'http://0.0.0.0:3333/sample/path?with=params')
+          echo "$RESULT"
+          if [[ $RESULT =~ '"method":"DELETE"' ]]
+          then
+            echo 'Test successful'
+            exit 0
+          else
+            echo 'Test failure'
+            exit 1
+          fi
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -15,7 +15,7 @@ jobs:
      contents: read
    steps:
      - name: Check out the repo
-        uses: actions/checkout@v3.1.0
+        uses: actions/checkout@v3.3.0

      - name: Log in to Docker Hub
        uses: docker/login-action@v2
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -6,12 +6,12 @@ jobs:
  build:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v3.3.0

      - name: Set up Go
        uses: actions/setup-go@v3
        with:
-          go-version: 1.16
+          go-version: 1.19

      - name: Build
        run: go build -v ./...
--- a/4
+++ b/4
@@ -1,4 +1,4 @@
-FROM golang:1.17.3-alpine3.13 as builder
+FROM golang:1.19-alpine as builder

 LABEL maintainer="Łukasz Budnik lukasz.budnik@gmail.com"

@@ -6,7 +6,7 @@ LABEL maintainer="Łukasz Budnik lukasz.budnik@gmail.com"
 ADD . /go/yosoy
 RUN cd /go/yosoy && go build

-FROM alpine:3.16.2
+FROM alpine:3.17
 COPY --from=builder /go/yosoy/yosoy /bin

 # register entrypoint
--- a/go.mod
+++ b/go.mod
@@ -5,5 +5,5 @@ go 1.16
 require (
 	github.com/gorilla/handlers v1.5.1
 	github.com/gorilla/mux v1.8.0
-	github.com/stretchr/testify v1.8.0
+	github.com/stretchr/testify v1.8.1
 )
--- a/go.sum
+++ b/go.sum
@@ -11,9 +11,11 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
+github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
Author	SHA1	Message	Date
Łukasz Budnik	48cb758883	Merge pull request #62 from lukaszbudnik/upgrade-docker-dependencies-add-integration-test upgraded docker containers for golang and alpine	2023-01-08 20:39:59 +01:00
Łukasz Budnik	196306d131	correct bash if-then-else syntax	2023-01-08 20:36:31 +01:00
Łukasz Budnik	c5415206e6	upgraded docker containers for golang and alpine, added simple integration test	2023-01-08 20:33:08 +01:00
Łukasz Budnik	66b4078631	Merge pull request #61 from lukaszbudnik/dependabot/github_actions/actions/checkout-3.3.0 Bump actions/checkout from 3.1.0 to 3.3.0	2023-01-08 17:43:12 +01:00
dependabot[bot]	d14e46e839	Bump actions/checkout from 3.1.0 to 3.3.0 Bumps [actions/checkout](https://github.com/actions/checkout) from 3.1.0 to 3.3.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3.1.0...v3.3.0) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2023-01-05 17:01:35 +00:00
Łukasz Budnik	21ffd8ef65	Merge pull request #57 from lukaszbudnik/dependabot/go_modules/github.com/stretchr/testify-1.8.1 Bump github.com/stretchr/testify from 1.8.0 to 1.8.1	2022-10-28 17:47:17 +02:00
dependabot[bot]	75cd57556b	Bump github.com/stretchr/testify from 1.8.0 to 1.8.1 Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.8.0 to 1.8.1. - [Release notes](https://github.com/stretchr/testify/releases) - [Commits](https://github.com/stretchr/testify/compare/v1.8.0...v1.8.1) --- updated-dependencies: - dependency-name: github.com/stretchr/testify dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-10-24 17:49:28 +00:00