Skip to content

Commit

Permalink
Merge branch 'master' into user-agent
Browse files Browse the repository at this point in the history
  • Loading branch information
Nuckal777 authored Sep 12, 2023
2 parents 725ac1f + 36551b8 commit b6c40e2
Show file tree
Hide file tree
Showing 142 changed files with 2,283 additions and 1,888 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
test:
strategy:
matrix:
go-version: [1.18.x, 1.19.x]
go-version: [1.20.x]
os: [ubuntu-latest]
runs-on: ${{ matrix.os }}
steps:
Expand All @@ -24,7 +24,7 @@ jobs:
uses: golangci/golangci-lint-action@v3
with:
# Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
version: v1.49.0
version: v1.53.2
- name: Tests
run: /bin/bash -c make gotest
- name: Build e2e
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ ARG VERSION=latest
FROM sapcc/kubernikus-binaries:$VERSION as kubernikus-binaries
FROM sapcc/kubernikus-docs:$VERSION as kubernikus-docs

FROM alpine:3.15 as kubernikus
FROM alpine:3.18 as kubernikus
LABEL source_repository="https://github.com/sapcc/kubernikus"
MAINTAINER "Fabian Ruff <[email protected]>"
RUN apk add --no-cache curl iptables
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile.kubernikus
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
ARG DOCS_IMAGE=keppel.eu-de-1.cloud.sap/ccloud/kubernikus-docs-builder:latest
FROM keppel.eu-de-1.cloud.sap/ccloud-dockerhub-mirror/library/golang:1.18-alpine3.15 as builder
FROM keppel.eu-de-1.cloud.sap/ccloud-dockerhub-mirror/library/golang:1.20-alpine3.18 as builder
WORKDIR /app
RUN apk add --no-cache make bash git curl gcc musl-dev
RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.50.0
RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.53.2
COPY . .
ENV GOARCH=amd64
ARG VERSION
Expand All @@ -13,7 +13,7 @@ RUN make build-e2e

FROM ${DOCS_IMAGE} as kubernikus-docs

FROM keppel.eu-de-1.cloud.sap/ccloud-dockerhub-mirror/library/alpine:3.15 as kubernikus
FROM keppel.eu-de-1.cloud.sap/ccloud-dockerhub-mirror/library/alpine:3.18 as kubernikus
LABEL source_repository="https://github.com/sapcc/kubernikus"
MAINTAINER "Fabian Ruff <[email protected]>"
RUN apk add --no-cache curl iptables
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.kubernikus-binaries
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM keppel.eu-de-1.cloud.sap/ccloud-dockerhub-mirror/library/golang:1.18-alpine3.15 as builder
FROM keppel.eu-de-1.cloud.sap/ccloud-dockerhub-mirror/library/golang:1.20-alpine3.18 as builder
RUN apk add --no-cache make git curl bash gcc musl-dev
WORKDIR /app
RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.50.0
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.kubernikus-docs2
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM keppel.eu-de-1.cloud.sap/ccloud-dockerhub-mirror/library/alpine:3.15
FROM keppel.eu-de-1.cloud.sap/ccloud-dockerhub-mirror/library/alpine:3.18
LABEL source_repository="https://github.com/sapcc/kubernikus"

ARG HUGO_VERSION=0.30.2
Expand Down
Loading

0 comments on commit b6c40e2

Please sign in to comment.