[pull] master from kiwicom:master

.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "gomod" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"

.github/workflows/makefile.yml

@@ -0,0 +1,48 @@
+name: Makefile CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container: golang:1.16.2
+
+    steps:
+       - uses: actions/checkout@v3
+       - name: build
+         run: make build
+
+  unit-test:
+    runs-on: ubuntu-latest
+    container: golang:1.16.2
+
+    steps:
+       - uses: actions/checkout@v3
+       - name: unit tests
+         run: make test/ci 
+
+  e2e-test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: well known
+        run: mkdir .well-known
+      - name: test
+        run: make e2e
+      - name: stop env
+        run: make e2e/env-stop
+
+  e2e-test-nocache:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: well known
+        run: mkdir .well-known
+      - name: test
+        run: REDIS_HOST=nocache make e2e
+      - name: stop env
+        run: make e2e/env-stop

Dockerfile

@@ -11,7 +11,7 @@ COPY . /app/
 ARG CI_COMMIT_SHORT_SHA
 RUN make build
 
-FROM alpine:3.12.3
+FROM alpine:3.15.2
 RUN  apk add --no-cache --virtual=.run-deps ca-certificates &&\
   mkdir /app
 

Makefile

@@ -3,7 +3,6 @@ GOLANGCI_LINT := $(shell command -v golangci-lint 2> /dev/null)
 install_deps:
 	go mod download
 	go install github.com/cespare/reflex@v0.3.0
-	go install github.com/golang/protobuf/protoc-gen-go@v1.4.3
 	go install github.com/go-swagger/go-swagger/cmd/swagger@v0.26.1
 
 start:
@@ -64,9 +63,6 @@ else
 	@echo "SENTRY_RELEASE: ${CI_COMMIT_SHORT_SHA}" >> .env.yaml
 endif
 
-proto:
-	protoc --go_out=plugins=grpc:. ./api/grpc/v1/kiwi_iamapi.proto
-
 swagger-validate:
 	swagger validate ./api/swagger.yml