Skip to content

Commit

Permalink
Release/v1.1.9 (#55)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
zeroc0d3 authored Oct 22, 2023
1 parent 50dffd3 commit cfea24c
Show file tree
Hide file tree
Showing 18 changed files with 981 additions and 889 deletions.
27 changes: 20 additions & 7 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,27 +22,40 @@ Customize Kubernetes Change Context (KUBECONFIG)
| Image name | Size |
|------------|------|
| `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) |
| `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) |
| `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) |
| `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) |
| `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) |
| `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) |
| `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) |
| `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) |
| `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) |
| `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) |
| `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) |
| `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) |
| `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) |


### Alpine (Depreciated)

| Image name | Size |
|------------|------|
| `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) |
| `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) |
| `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) |
| `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) |
| `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) |
| `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) |
| `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) |
| `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) |
| `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) |
| `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) |
| `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) |
| `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) |
| `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) |
| `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) |
| `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) |

---

### version 1.1.9

- Update version golang to `1.21.3`
- Update docker `alpine` from `3.17` to `3.18`
- Change default binary name from `k8s-context` to `k8c`

---

Expand Down
11 changes: 6 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,9 @@ RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 \


### Binary ###
# FROM golang:1.19.5-alpine3.17
FROM nginx:${NGINX_VERSION:-1.23-alpine}
# FROM golang:${GOLANG_VERSION:-1.21.3-alpine3.18}
# FROM nginx:${NGINX_VERSION:-1.25-alpine3.18}
FROM nginx:${NGINX_VERSION:-1.25-alpine}

ARG BUILD_DATE
ARG BUILD_VERSION
Expand All @@ -31,11 +32,11 @@ ARG GIT_URL
ENV VENDOR="DevOpsCornerId"
ENV AUTHOR="DevOpsCorner.id <[email protected]>"
ENV IMG_NAME="alpine"
ENV IMG_VERSION="3.17"
ENV IMG_DESC="Docker GO App Alpine 3.17"
ENV IMG_VERSION="3.18"
ENV IMG_DESC="Docker GO App Alpine 3.18"
ENV IMG_ARCH="amd64/x86_64"

ENV ALPINE_VERSION="3.17"
ENV ALPINE_VERSION="3.18"

LABEL maintainer="$AUTHOR" \
architecture="$IMG_ARCH" \
Expand Down
3 changes: 2 additions & 1 deletion Dockerfile.alpine-3.15
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 \


### Binary ###
# FROM golang:1.19.3-alpine3.15
# FROM golang:${GOLANG_VERSION:-1.19.3-alpine3.15}
FROM nginx:${NGINX_VERSION:-1.23-alpine}

ARG BUILD_DATE
Expand Down Expand Up @@ -77,6 +77,7 @@ COPY --from=devopscorner/cicd:alpine /usr/local/bin/ /usr/local/bin/
COPY --from=devopscorner/cicd:alpine /usr/local/aws-cli/ /usr/local/aws-cli/
COPY --from=builder-go /go/src/app/goapp /usr/local/bin/k8s-context
COPY --from=builder-go /go/src/app/goapp /usr/local/bin/kc
COPY --from=builder-go /go/src/app/goapp /usr/local/bin/k8c

EXPOSE 22 80 443

Expand Down
3 changes: 2 additions & 1 deletion Dockerfile.alpine-3.16
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 \


### Binary ###
# FROM golang:1.19.5-alpine3.16
# FROM golang:${GOLANG_VERSION:-1.19.5-alpine3.16}
FROM nginx:${NGINX_VERSION:-1.23-alpine}

ARG BUILD_DATE
Expand Down Expand Up @@ -77,6 +77,7 @@ COPY --from=devopscorner/cicd:alpine /usr/local/bin/ /usr/local/bin/
COPY --from=devopscorner/cicd:alpine /usr/local/aws-cli/ /usr/local/aws-cli/
COPY --from=builder-go /go/src/app/goapp /usr/local/bin/k8s-context
COPY --from=builder-go /go/src/app/goapp /usr/local/bin/kc
COPY --from=builder-go /go/src/app/goapp /usr/local/bin/k8c

EXPOSE 22 80 443

Expand Down
3 changes: 2 additions & 1 deletion Dockerfile.alpine-3.17
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 \


### Binary ###
# FROM golang:1.19.5-alpine3.17
# FROM golang:${GOLANG_VERSION:-1.19.5-alpine3.17}
FROM nginx:${NGINX_VERSION:-1.23-alpine}

ARG BUILD_DATE
Expand Down Expand Up @@ -77,6 +77,7 @@ COPY --from=devopscorner/cicd:alpine /usr/local/bin/ /usr/local/bin/
COPY --from=devopscorner/cicd:alpine /usr/local/aws-cli/ /usr/local/aws-cli/
COPY --from=builder-go /go/src/app/goapp /usr/local/bin/k8s-context
COPY --from=builder-go /go/src/app/goapp /usr/local/bin/kc
COPY --from=builder-go /go/src/app/goapp /usr/local/bin/k8c

EXPOSE 22 80 443

Expand Down
87 changes: 87 additions & 0 deletions Dockerfile.alpine-3.18
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
### Builder Go ###
FROM golang:alpine as builder-go

WORKDIR /go/src/app
ENV GIN_MODE=release
ENV GOPATH=/go

RUN apk add --no-cache \
build-base \
git \
curl \
make \
bash

COPY src /go/src/app

RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 \
cd /go/src/app && \
go build -mod=readonly -ldflags="-s -w" -o goapp


### Binary ###
# FROM golang:${GOLANG_VERSION:-1.21.3-alpine3.18}
# FROM nginx:${NGINX_VERSION:-1.25-alpine3.18}
FROM nginx:${NGINX_VERSION:-1.25-alpine}

ARG BUILD_DATE
ARG BUILD_VERSION
ARG GIT_COMMIT
ARG GIT_URL

ENV VENDOR="DevOpsCornerId"
ENV AUTHOR="DevOpsCorner.id <[email protected]>"
ENV IMG_NAME="alpine"
ENV IMG_VERSION="3.18"
ENV IMG_DESC="Docker GO App Alpine 3.18"
ENV IMG_ARCH="amd64/x86_64"

ENV ALPINE_VERSION="3.18"

LABEL maintainer="$AUTHOR" \
architecture="$IMG_ARCH" \
ubuntu-version="$ALPINE_VERSION" \
org.label-schema.build-date="$BUILD_DATE" \
org.label-schema.name="$IMG_NAME" \
org.label-schema.description="$IMG_DESC" \
org.label-schema.vcs-ref="$GIT_COMMIT" \
org.label-schema.vcs-url="$GIT_URL" \
org.label-schema.vendor="$VENDOR" \
org.label-schema.version="$BUILD_VERSION" \
org.label-schema.schema-version="$IMG_VERSION" \
org.opencontainers.image.authors="$AUTHOR" \
org.opencontainers.image.description="$IMG_DESC" \
org.opencontainers.image.vendor="$VENDOR" \
org.opencontainers.image.version="$IMG_VERSION" \
org.opencontainers.image.revision="$GIT_COMMIT" \
org.opencontainers.image.created="$BUILD_DATE" \
fr.hbis.docker.base.build-date="$BUILD_DATE" \
fr.hbis.docker.base.name="$IMG_NAME" \
fr.hbis.docker.base.vendor="$VENDOR" \
fr.hbis.docker.base.version="$BUILD_VERSION"

ENV GIN_MODE=release

RUN apk add --no-cache \
build-base \
git \
curl \
make \
bash \
nano

# COPY --from=alpine/k8s:1.26.2 /usr/local/bin/ /usr/local/bin/
# COPY --from=devopscorner/aws-cli:latest /usr/local/aws-cli/ /usr/local/aws-cli/
# COPY --from=devopscorner/aws-cli:latest /aws-cli-bin/ /usr/local/bin/
COPY --from=devopscorner/cicd:alpine /root/.tfenv /root/.tfenv
COPY --from=devopscorner/cicd:alpine /usr/local/bin/ /usr/local/bin/
COPY --from=devopscorner/cicd:alpine /usr/local/aws-cli/ /usr/local/aws-cli/
COPY --from=builder-go /go/src/app/goapp /usr/local/bin/k8s-context
COPY --from=builder-go /go/src/app/goapp /usr/local/bin/kc
COPY --from=builder-go /go/src/app/goapp /usr/local/bin/k8c

EXPOSE 22 80 443

STOPSIGNAL SIGQUIT

CMD ["nginx", "-g", "daemon off;"]
12 changes: 6 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,23 @@ export AWS_DEFAULT_REGION="ap-southeast-1"

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

IMAGE = $(CI_REGISTRY)/${CI_PROJECT_PATH}/${CI_PROJECT_NAME}
DIR = $(shell pwd)
VERSION ?= 1.7.0
VERSION ?= 1.1.9

export BASE_IMAGE=alpine
export BASE_VERSION=3.17
export ALPINE_VERSION=3.17
export BASE_VERSION=3.18
export ALPINE_VERSION=3.18

GO_APP ?= k8s-context
GO_APP ?= k8c
SOURCES = $(shell find . -name '*.go' | grep -v /vendor/)
VERSION ?= $(shell git describe --tags --always --dirty)
GOPKGS = $(shell go list ./ | grep -v /vendor/)
BUILD_FLAGS ?=
LDFLAGS ?= -X github.com/devopscorner/k8s-context/config.Version=$(VERSION) -w -s
TAG ?= "v0.3.0"
TAG ?= "v1.1.9"
GOARCH ?= amd64
GOOS ?= linux
GO111MODULE ?= on
Expand Down
Loading

0 comments on commit cfea24c

Please sign in to comment.