From acaae50c4e23699138f7d9e7f6fe45447bea0950 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= <l.mierzwa@gmail.com>
Date: Fri, 18 Oct 2019 15:41:15 +0100
Subject: [PATCH 1/2] feat(ci): rebuild openapi client code in CI and check for
 differences

This ensures that we fail CI if the openapi client code that's commited to git is different than what the current code would generate
---
 .travis.yml | 12 ++++++++++++
 Makefile    |  4 ++++
 2 files changed, 16 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index eae8d46f9..6fe164d6c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -107,6 +107,18 @@ jobs:
       <<: *DEFAULTS_JS
       script: make lint-docs
 
+    - stage: Lint
+      name: Verify OpenAPI client code
+      if: (repo = prymitive/karma AND type != pull_request) OR (repo != prymitive/karma AND type = pull_request)
+      language: generic
+      addons:
+        apt:
+          packages:
+            - docker-ce
+      script:
+        - travis_retry make openapi-client
+        - git diff --exit-code
+
     - stage: Snapshots
       name: Percy UI snapshots
       if: (repo = prymitive/karma AND type != pull_request) OR (repo != prymitive/karma AND type = pull_request)
diff --git a/Makefile b/Makefile
index e3dab2ad5..03dde31a8 100644
--- a/Makefile
+++ b/Makefile
@@ -167,6 +167,10 @@ format-go: .build/deps-build-go.ok
 format-js: .build/deps-build-node.ok
 	cd ui && ./node_modules/.bin/prettier --write 'src/**/*.js'
 
+.PHONY: openapi-client
+openapi-client:
+	for f in $(wildcard internal/mapper/*/Dockerfile) ; do $(MAKE) -C `dirname "$$f"` ; done
+
 .PHONY: show-version
 show-version:
 	@echo $(VERSION)

From 755e950e353cd0396769c974d42791167c6e533f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= <l.mierzwa@gmail.com>
Date: Fri, 18 Oct 2019 16:01:25 +0100
Subject: [PATCH 2/2] fix(docker): run apk update && apk upgrade when
 installing packages

---
 Dockerfile                      | 4 ++--
 demo/Dockerfile                 | 6 +++---
 internal/mapper/v017/Dockerfile | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index da73af3c1..d5c6d9371 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,11 @@
 FROM node:10.16.3-alpine as nodejs-builder
-RUN apk add --update make git
+RUN apk update && apk upgrade && apk add --update make git
 COPY Makefile /src/Makefile
 COPY ui /src/ui
 RUN make -C /src ui
 
 FROM golang:1.13.3-alpine as go-builder
-RUN apk add --update make git
+RUN apk update && apk upgrade && apk add --update make git
 COPY Makefile /src/Makefile
 COPY go.mod /src/go.mod
 COPY go.sum /src/go.sum
diff --git a/demo/Dockerfile b/demo/Dockerfile
index eb0c88609..64ce4bc8c 100644
--- a/demo/Dockerfile
+++ b/demo/Dockerfile
@@ -1,11 +1,11 @@
 FROM node:10.16.3-alpine as nodejs-builder
-RUN apk add --update make git
+RUN apk update && apk upgrade && apk add --update make git
 COPY Makefile /src/Makefile
 COPY ui /src/ui
 RUN make -C /src ui
 
 FROM golang:1.13.3-alpine as go-builder
-RUN apk add --update make git
+RUN apk update && apk upgrade && apk add --update make git
 COPY Makefile /src/Makefile
 COPY go.mod /src/go.mod
 COPY go.sum /src/go.sum
@@ -18,7 +18,7 @@ ARG VERSION
 RUN CGO_ENABLED=0 make -C /src VERSION="${VERSION:-dev}" karma
 
 FROM alpine:3.10
-RUN apk add --update supervisor python && rm  -rf /tmp/* /var/cache/apk/*
+RUN apk update && apk upgrade && apk add --update supervisor python && rm  -rf /tmp/* /var/cache/apk/*
 COPY demo/supervisord.conf /etc/supervisord.conf
 COPY --from=prom/alertmanager:v0.19.0 /bin/alertmanager /alertmanager
 COPY demo/alertmanager.yaml /etc/alertmanager.yaml
diff --git a/internal/mapper/v017/Dockerfile b/internal/mapper/v017/Dockerfile
index ab35e2daf..62861d144 100644
--- a/internal/mapper/v017/Dockerfile
+++ b/internal/mapper/v017/Dockerfile
@@ -1,6 +1,6 @@
 FROM quay.io/goswagger/swagger:v0.20.1
 
-RUN apk add --update curl
+RUN apk update && apk upgrade && apk add --update curl
 
 COPY run.sh /run.sh