Skip to content

Commit cfea24c

Browse files
zeroc0d3zeroc0d3
authored
Release/v1.1.9 (devopscorner#55)
* Update dependencies for golang 1.21.3 version * Update dockerfile configuration * Update binary version for build container * Update badges docker images version to 1.1.9
1 parent 50dffd3 commit cfea24c

18 files changed

+981
-889
lines changed

‎CHANGELOG.md

+20-7
Original file line numberDiff line numberDiff line change
@@ -22,27 +22,40 @@ Customize Kubernetes Change Context (KUBECONFIG)
2222
| Image name | Size |
2323
|------------|------|
2424
| `devopscorner/k8s-context:latest` | [![docker image size](https://img.shields.io/docker/image-size/devopscorner/k8s-context/latest.svg?label=Image%20size&logo=docker)](https://hub.docker.com/repository/docker/devopscorner/k8s-context/tags?page=1&ordering=last_updated&name=latest) ![default-aws-cli](https://img.shields.io/static/v1?label=latest&message=default&color=brightgreen) ![latest-aws-cli](https://img.shields.io/static/v1?label=latest&message=alpine&color=orange) |
25-
| `devopscorner/k8s-context:1.1.7` | [![docker image size](https://img.shields.io/docker/image-size/devopscorner/k8s-context/1.1.7.svg?label=Image%20size&logo=docker)](https://hub.docker.com/repository/docker/devopscorner/k8s-context/tags?page=1&ordering=last_updated&name=1.1.7) ![latest-1.1.7](https://img.shields.io/static/v1?label=latest&message=1.1.7&color=orange) |
2625
| `devopscorner/k8s-context:alpine` | [![docker image size](https://img.shields.io/docker/image-size/devopscorner/k8s-context/alpine.svg?label=Image%20size&logo=docker)](https://hub.docker.com/repository/docker/devopscorner/k8s-context/tags?page=1&ordering=last_updated&name=alpine) |
2726
| `devopscorner/k8s-context:alpine-latest` | [![docker image size](https://img.shields.io/docker/image-size/devopscorner/k8s-context/alpine-latest.svg?label=Image%20size&logo=docker)](https://hub.docker.com/repository/docker/devopscorner/k8s-context/tags?page=1&ordering=last_updated&name=alpine-latest) |
28-
| `devopscorner/k8s-context:alpine-3.16` | [![docker image size](https://img.shields.io/docker/image-size/devopscorner/k8s-context/alpine-3.16.svg?label=Image%20size&logo=docker)](https://hub.docker.com/repository/docker/devopscorner/k8s-context/tags?page=1&ordering=last_updated&name=alpine-3.16) |
29-
| `devopscorner/k8s-context:go1.19-alpine3.16` | [![docker image size](https://img.shields.io/docker/image-size/devopscorner/k8s-context/go1.19-alpine3.16.svg?label=Image%20size&logo=docker)](https://hub.docker.com/repository/docker/devopscorner/k8s-context/tags?page=1&ordering=last_updated&name=go1.19-alpine3.16) |
30-
| `devopscorner/k8s-context:go1.19.5-alpine3.16` | [![docker image size](https://img.shields.io/docker/image-size/devopscorner/k8s-context/go1.19.5-alpine3.16.svg?label=Image%20size&logo=docker)](https://hub.docker.com/repository/docker/devopscorner/k8s-context/tags?page=1&ordering=last_updated&name=go1.19.5-alpine3.16) |
31-
| `devopscorner/k8s-context:alpine-3.17` | [![docker image size](https://img.shields.io/docker/image-size/devopscorner/k8s-context/alpine-3.17.svg?label=Image%20size&logo=docker)](https://hub.docker.com/repository/docker/devopscorner/k8s-context/tags?page=1&ordering=last_updated&name=alpine-3.17) |
32-
| `devopscorner/k8s-context:go1.19-alpine3.17` | [![docker image size](https://img.shields.io/docker/image-size/devopscorner/k8s-context/go1.19-alpine3.17.svg?label=Image%20size&logo=docker)](https://hub.docker.com/repository/docker/devopscorner/k8s-context/tags?page=1&ordering=last_updated&name=go1.19-alpine3.17) |
33-
| `devopscorner/k8s-context:go1.19.5-alpine3.17` | [![docker image size](https://img.shields.io/docker/image-size/devopscorner/k8s-context/go1.19.5-alpine3.17.svg?label=Image%20size&logo=docker)](https://hub.docker.com/repository/docker/devopscorner/k8s-context/tags?page=1&ordering=last_updated&name=go1.19.5-alpine3.17) |
27+
| `devopscorner/k8s-context:1.1.9` | [![docker image size](https://img.shields.io/docker/image-size/devopscorner/k8s-context/1.1.9.svg?label=Image%20size&logo=docker)](https://hub.docker.com/repository/docker/devopscorner/k8s-context/tags?page=1&ordering=last_updated&name=1.1.9) ![latest-1.1.9](https://img.shields.io/static/v1?label=latest&message=1.1.9&color=orange) |
28+
| `devopscorner/k8s-context:go1.21-alpine3.18` | [![docker image size](https://img.shields.io/docker/image-size/devopscorner/k8s-context/go1.21-alpine3.18.svg?label=Image%20size&logo=docker)](https://hub.docker.com/repository/docker/devopscorner/k8s-context/tags?page=1&ordering=last_updated&name=go1.21-alpine3.18) |
29+
| `devopscorner/k8s-context:go1.21.3-alpine3.18` | [![docker image size](https://img.shields.io/docker/image-size/devopscorner/k8s-context/go1.21.3-alpine3.18.svg?label=Image%20size&logo=docker)](https://hub.docker.com/repository/docker/devopscorner/k8s-context/tags?page=1&ordering=last_updated&name=go1.21.3-alpine3.18) |
30+
3431

3532
### Alpine (Depreciated)
3633

3734
| Image name | Size |
3835
|------------|------|
36+
| `devopscorner/k8s-context:1.1.8` | [![docker image size](https://img.shields.io/docker/image-size/devopscorner/k8s-context/1.1.8.svg?label=Image%20size&logo=docker)](https://hub.docker.com/repository/docker/devopscorner/k8s-context/tags?page=1&ordering=last_updated&name=1.1.8) |
37+
| `devopscorner/k8s-context:1.1.7` | [![docker image size](https://img.shields.io/docker/image-size/devopscorner/k8s-context/1.1.7.svg?label=Image%20size&logo=docker)](https://hub.docker.com/repository/docker/devopscorner/k8s-context/tags?page=1&ordering=last_updated&name=1.1.7) |
3938
| `devopscorner/k8s-context:1.1.6` | [![docker image size](https://img.shields.io/docker/image-size/devopscorner/k8s-context/1.1.6.svg?label=Image%20size&logo=docker)](https://hub.docker.com/repository/docker/devopscorner/k8s-context/tags?page=1&ordering=last_updated&name=1.1.6) |
4039
| `devopscorner/k8s-context:1.1.5` | [![docker image size](https://img.shields.io/docker/image-size/devopscorner/k8s-context/1.1.5.svg?label=Image%20size&logo=docker)](https://hub.docker.com/repository/docker/devopscorner/k8s-context/tags?page=1&ordering=last_updated&name=1.1.5) |
4140
| `devopscorner/k8s-context:1.1.4` | [![docker image size](https://img.shields.io/docker/image-size/devopscorner/k8s-context/1.1.4.svg?label=Image%20size&logo=docker)](https://hub.docker.com/repository/docker/devopscorner/k8s-context/tags?page=1&ordering=last_updated&name=1.1.4) |
4241
| `devopscorner/k8s-context:1.1.3` | [![docker image size](https://img.shields.io/docker/image-size/devopscorner/k8s-context/1.1.3.svg?label=Image%20size&logo=docker)](https://hub.docker.com/repository/docker/devopscorner/k8s-context/tags?page=1&ordering=last_updated&name=1.1.3) |
4342
| `devopscorner/k8s-context:alpine-3.15` | [![docker image size](https://img.shields.io/docker/image-size/devopscorner/k8s-context/alpine-3.15.svg?label=Image%20size&logo=docker)](https://hub.docker.com/repository/docker/devopscorner/k8s-context/tags?page=1&ordering=last_updated&name=alpine-3.15) |
4443
| `devopscorner/k8s-context:go1.19-alpine3.15` | [![docker image size](https://img.shields.io/docker/image-size/devopscorner/k8s-context/go1.19-alpine3.15.svg?label=Image%20size&logo=docker)](https://hub.docker.com/repository/docker/devopscorner/k8s-context/tags?page=1&ordering=last_updated&name=go1.19-alpine3.15) |
4544
| `devopscorner/k8s-context:go1.19.3-alpine3.15` | [![docker image size](https://img.shields.io/docker/image-size/devopscorner/k8s-context/go1.19.3-alpine3.15.svg?label=Image%20size&logo=docker)](https://hub.docker.com/repository/docker/devopscorner/k8s-context/tags?page=1&ordering=last_updated&name=go1.19.3-alpine3.15) |
45+
| `devopscorner/k8s-context:alpine-3.16` | [![docker image size](https://img.shields.io/docker/image-size/devopscorner/k8s-context/alpine-3.16.svg?label=Image%20size&logo=docker)](https://hub.docker.com/repository/docker/devopscorner/k8s-context/tags?page=1&ordering=last_updated&name=alpine-3.16) |
46+
| `devopscorner/k8s-context:go1.19-alpine3.16` | [![docker image size](https://img.shields.io/docker/image-size/devopscorner/k8s-context/go1.19-alpine3.16.svg?label=Image%20size&logo=docker)](https://hub.docker.com/repository/docker/devopscorner/k8s-context/tags?page=1&ordering=last_updated&name=go1.19-alpine3.16) |
47+
| `devopscorner/k8s-context:go1.19.5-alpine3.16` | [![docker image size](https://img.shields.io/docker/image-size/devopscorner/k8s-context/go1.19.5-alpine3.16.svg?label=Image%20size&logo=docker)](https://hub.docker.com/repository/docker/devopscorner/k8s-context/tags?page=1&ordering=last_updated&name=go1.19.5-alpine3.16) |
48+
| `devopscorner/k8s-context:alpine-3.17` | [![docker image size](https://img.shields.io/docker/image-size/devopscorner/k8s-context/alpine-3.17.svg?label=Image%20size&logo=docker)](https://hub.docker.com/repository/docker/devopscorner/k8s-context/tags?page=1&ordering=last_updated&name=alpine-3.17) |
49+
| `devopscorner/k8s-context:go1.19-alpine3.17` | [![docker image size](https://img.shields.io/docker/image-size/devopscorner/k8s-context/go1.19-alpine3.17.svg?label=Image%20size&logo=docker)](https://hub.docker.com/repository/docker/devopscorner/k8s-context/tags?page=1&ordering=last_updated&name=go1.19-alpine3.17) |
50+
| `devopscorner/k8s-context:go1.19.5-alpine3.17` | [![docker image size](https://img.shields.io/docker/image-size/devopscorner/k8s-context/go1.19.5-alpine3.17.svg?label=Image%20size&logo=docker)](https://hub.docker.com/repository/docker/devopscorner/k8s-context/tags?page=1&ordering=last_updated&name=go1.19.5-alpine3.17) |
51+
52+
---
53+
54+
### version 1.1.9
55+
56+
- Update version golang to `1.21.3`
57+
- Update docker `alpine` from `3.17` to `3.18`
58+
- Change default binary name from `k8s-context` to `k8c`
4659

4760
---
4861

‎Dockerfile

+6-5
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@ RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 \
2020

2121

2222
### Binary ###
23-
# FROM golang:1.19.5-alpine3.17
24-
FROM nginx:${NGINX_VERSION:-1.23-alpine}
23+
# FROM golang:${GOLANG_VERSION:-1.21.3-alpine3.18}
24+
# FROM nginx:${NGINX_VERSION:-1.25-alpine3.18}
25+
FROM nginx:${NGINX_VERSION:-1.25-alpine}
2526

2627
ARG BUILD_DATE
2728
ARG BUILD_VERSION
@@ -31,11 +32,11 @@ ARG GIT_URL
3132
ENV VENDOR="DevOpsCornerId"
3233
ENV AUTHOR="DevOpsCorner.id <[email protected]>"
3334
ENV IMG_NAME="alpine"
34-
ENV IMG_VERSION="3.17"
35-
ENV IMG_DESC="Docker GO App Alpine 3.17"
35+
ENV IMG_VERSION="3.18"
36+
ENV IMG_DESC="Docker GO App Alpine 3.18"
3637
ENV IMG_ARCH="amd64/x86_64"
3738

38-
ENV ALPINE_VERSION="3.17"
39+
ENV ALPINE_VERSION="3.18"
3940

4041
LABEL maintainer="$AUTHOR" \
4142
architecture="$IMG_ARCH" \

‎Dockerfile.alpine-3.15

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 \
2020

2121

2222
### Binary ###
23-
# FROM golang:1.19.3-alpine3.15
23+
# FROM golang:${GOLANG_VERSION:-1.19.3-alpine3.15}
2424
FROM nginx:${NGINX_VERSION:-1.23-alpine}
2525

2626
ARG BUILD_DATE
@@ -77,6 +77,7 @@ COPY --from=devopscorner/cicd:alpine /usr/local/bin/ /usr/local/bin/
7777
COPY --from=devopscorner/cicd:alpine /usr/local/aws-cli/ /usr/local/aws-cli/
7878
COPY --from=builder-go /go/src/app/goapp /usr/local/bin/k8s-context
7979
COPY --from=builder-go /go/src/app/goapp /usr/local/bin/kc
80+
COPY --from=builder-go /go/src/app/goapp /usr/local/bin/k8c
8081

8182
EXPOSE 22 80 443
8283

‎Dockerfile.alpine-3.16

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 \
2020

2121

2222
### Binary ###
23-
# FROM golang:1.19.5-alpine3.16
23+
# FROM golang:${GOLANG_VERSION:-1.19.5-alpine3.16}
2424
FROM nginx:${NGINX_VERSION:-1.23-alpine}
2525

2626
ARG BUILD_DATE
@@ -77,6 +77,7 @@ COPY --from=devopscorner/cicd:alpine /usr/local/bin/ /usr/local/bin/
7777
COPY --from=devopscorner/cicd:alpine /usr/local/aws-cli/ /usr/local/aws-cli/
7878
COPY --from=builder-go /go/src/app/goapp /usr/local/bin/k8s-context
7979
COPY --from=builder-go /go/src/app/goapp /usr/local/bin/kc
80+
COPY --from=builder-go /go/src/app/goapp /usr/local/bin/k8c
8081

8182
EXPOSE 22 80 443
8283

‎Dockerfile.alpine-3.17

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 \
2020

2121

2222
### Binary ###
23-
# FROM golang:1.19.5-alpine3.17
23+
# FROM golang:${GOLANG_VERSION:-1.19.5-alpine3.17}
2424
FROM nginx:${NGINX_VERSION:-1.23-alpine}
2525

2626
ARG BUILD_DATE
@@ -77,6 +77,7 @@ COPY --from=devopscorner/cicd:alpine /usr/local/bin/ /usr/local/bin/
7777
COPY --from=devopscorner/cicd:alpine /usr/local/aws-cli/ /usr/local/aws-cli/
7878
COPY --from=builder-go /go/src/app/goapp /usr/local/bin/k8s-context
7979
COPY --from=builder-go /go/src/app/goapp /usr/local/bin/kc
80+
COPY --from=builder-go /go/src/app/goapp /usr/local/bin/k8c
8081

8182
EXPOSE 22 80 443
8283

‎Dockerfile.alpine-3.18

+87
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
### Builder Go ###
2+
FROM golang:alpine as builder-go
3+
4+
WORKDIR /go/src/app
5+
ENV GIN_MODE=release
6+
ENV GOPATH=/go
7+
8+
RUN apk add --no-cache \
9+
build-base \
10+
git \
11+
curl \
12+
make \
13+
bash
14+
15+
COPY src /go/src/app
16+
17+
RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 \
18+
cd /go/src/app && \
19+
go build -mod=readonly -ldflags="-s -w" -o goapp
20+
21+
22+
### Binary ###
23+
# FROM golang:${GOLANG_VERSION:-1.21.3-alpine3.18}
24+
# FROM nginx:${NGINX_VERSION:-1.25-alpine3.18}
25+
FROM nginx:${NGINX_VERSION:-1.25-alpine}
26+
27+
ARG BUILD_DATE
28+
ARG BUILD_VERSION
29+
ARG GIT_COMMIT
30+
ARG GIT_URL
31+
32+
ENV VENDOR="DevOpsCornerId"
33+
ENV AUTHOR="DevOpsCorner.id <[email protected]>"
34+
ENV IMG_NAME="alpine"
35+
ENV IMG_VERSION="3.18"
36+
ENV IMG_DESC="Docker GO App Alpine 3.18"
37+
ENV IMG_ARCH="amd64/x86_64"
38+
39+
ENV ALPINE_VERSION="3.18"
40+
41+
LABEL maintainer="$AUTHOR" \
42+
architecture="$IMG_ARCH" \
43+
ubuntu-version="$ALPINE_VERSION" \
44+
org.label-schema.build-date="$BUILD_DATE" \
45+
org.label-schema.name="$IMG_NAME" \
46+
org.label-schema.description="$IMG_DESC" \
47+
org.label-schema.vcs-ref="$GIT_COMMIT" \
48+
org.label-schema.vcs-url="$GIT_URL" \
49+
org.label-schema.vendor="$VENDOR" \
50+
org.label-schema.version="$BUILD_VERSION" \
51+
org.label-schema.schema-version="$IMG_VERSION" \
52+
org.opencontainers.image.authors="$AUTHOR" \
53+
org.opencontainers.image.description="$IMG_DESC" \
54+
org.opencontainers.image.vendor="$VENDOR" \
55+
org.opencontainers.image.version="$IMG_VERSION" \
56+
org.opencontainers.image.revision="$GIT_COMMIT" \
57+
org.opencontainers.image.created="$BUILD_DATE" \
58+
fr.hbis.docker.base.build-date="$BUILD_DATE" \
59+
fr.hbis.docker.base.name="$IMG_NAME" \
60+
fr.hbis.docker.base.vendor="$VENDOR" \
61+
fr.hbis.docker.base.version="$BUILD_VERSION"
62+
63+
ENV GIN_MODE=release
64+
65+
RUN apk add --no-cache \
66+
build-base \
67+
git \
68+
curl \
69+
make \
70+
bash \
71+
nano
72+
73+
# COPY --from=alpine/k8s:1.26.2 /usr/local/bin/ /usr/local/bin/
74+
# COPY --from=devopscorner/aws-cli:latest /usr/local/aws-cli/ /usr/local/aws-cli/
75+
# COPY --from=devopscorner/aws-cli:latest /aws-cli-bin/ /usr/local/bin/
76+
COPY --from=devopscorner/cicd:alpine /root/.tfenv /root/.tfenv
77+
COPY --from=devopscorner/cicd:alpine /usr/local/bin/ /usr/local/bin/
78+
COPY --from=devopscorner/cicd:alpine /usr/local/aws-cli/ /usr/local/aws-cli/
79+
COPY --from=builder-go /go/src/app/goapp /usr/local/bin/k8s-context
80+
COPY --from=builder-go /go/src/app/goapp /usr/local/bin/kc
81+
COPY --from=builder-go /go/src/app/goapp /usr/local/bin/k8c
82+
83+
EXPOSE 22 80 443
84+
85+
STOPSIGNAL SIGQUIT
86+
87+
CMD ["nginx", "-g", "daemon off;"]

‎Makefile

+6-6
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,23 @@ export AWS_DEFAULT_REGION="ap-southeast-1"
1313

1414
export CI_REGISTRY ?= $(ARGS).dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com
1515
export CI_PROJECT_PATH ?= devopscorner
16-
export CI_PROJECT_NAME ?= k8s-context
16+
export CI_PROJECT_NAME ?= k8c
1717

1818
IMAGE = $(CI_REGISTRY)/${CI_PROJECT_PATH}/${CI_PROJECT_NAME}
1919
DIR = $(shell pwd)
20-
VERSION ?= 1.7.0
20+
VERSION ?= 1.1.9
2121

2222
export BASE_IMAGE=alpine
23-
export BASE_VERSION=3.17
24-
export ALPINE_VERSION=3.17
23+
export BASE_VERSION=3.18
24+
export ALPINE_VERSION=3.18
2525

26-
GO_APP ?= k8s-context
26+
GO_APP ?= k8c
2727
SOURCES = $(shell find . -name '*.go' | grep -v /vendor/)
2828
VERSION ?= $(shell git describe --tags --always --dirty)
2929
GOPKGS = $(shell go list ./ | grep -v /vendor/)
3030
BUILD_FLAGS ?=
3131
LDFLAGS ?= -X github.com/devopscorner/k8s-context/config.Version=$(VERSION) -w -s
32-
TAG ?= "v0.3.0"
32+
TAG ?= "v1.1.9"
3333
GOARCH ?= amd64
3434
GOOS ?= linux
3535
GO111MODULE ?= on

0 commit comments

Comments
 (0)