Skip to content

Commit 97092e6

Browse files
zeroc0d3zeroc0d3
authored
Merge pull request #4 from devopscorner/develop
Develop
2 parents 416890a + e0bbf49 commit 97092e6

File tree

7 files changed

+77
-135
lines changed

7 files changed

+77
-135
lines changed

‎CHANGELOG.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ Customize Kubernetes Change Context (KUBECONFIG)
2121

2222
| Image name | Size |
2323
|------------|------|
24-
| `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) |
24+
| `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.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) ![latest-1.1.3](https://img.shields.io/static/v1?label=latest&message=1.1.3&color=orange) |
2526
| `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) |
2627
| `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) |
2728
| `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) |

‎Dockerfile‎

Lines changed: 16 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -19,30 +19,6 @@ RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 \
1919
go build -mod=readonly -ldflags="-s -w" -o goapp
2020

2121

22-
### Builder Python ###
23-
FROM python:3.10.10-alpine${ALPINE_VERSION:-3.17} as builder-python
24-
25-
ARG AWS_CLI_VERSION=2.11.0
26-
RUN apk add --no-cache git unzip groff build-base libffi-dev cmake
27-
RUN git clone --single-branch --depth 1 -b ${AWS_CLI_VERSION} https://github.com/aws/aws-cli.git
28-
29-
WORKDIR aws-cli
30-
RUN python -m venv venv
31-
RUN . venv/bin/activate
32-
RUN scripts/installers/make-exe
33-
RUN unzip -q dist/awscli-exe.zip
34-
RUN aws/install --bin-dir /aws-cli-bin
35-
RUN /aws-cli-bin/aws --version
36-
37-
# reduce image size: remove autocomplete and examples
38-
RUN rm -rf \
39-
/usr/local/aws-cli/v2/current/dist/aws_completer \
40-
/usr/local/aws-cli/v2/current/dist/awscli/data/ac.index \
41-
/usr/local/aws-cli/v2/current/dist/awscli/examples
42-
RUN find /usr/local/aws-cli/v2/current/dist/awscli/data -name completions-1*.json -delete
43-
RUN find /usr/local/aws-cli/v2/current/dist/awscli/botocore/data -name examples-1.json -delete
44-
45-
4622
### Binary ###
4723
# FROM golang:1.19.5-alpine3.17
4824
FROM nginx:${NGINX_VERSION:-1.23-alpine}
@@ -84,10 +60,23 @@ LABEL maintainer="$AUTHOR" \
8460
fr.hbis.docker.base.version="$BUILD_VERSION"
8561

8662
ENV GIN_MODE=release
87-
COPY --from=alpine/k8s:1.26.2 /usr/bin/ /usr/local/bin/
88-
COPY --from=builder-python /usr/local/aws-cli/ /usr/local/aws-cli/
89-
COPY --from=builder-python /aws-cli-bin/ /usr/local/bin/
63+
64+
RUN apk add --no-cache \
65+
build-base \
66+
git \
67+
curl \
68+
make \
69+
bash \
70+
nano
71+
72+
# COPY --from=alpine/k8s:1.26.2 /usr/local/bin/ /usr/local/bin/
73+
# COPY --from=devopscorner/aws-cli:latest /usr/local/aws-cli/ /usr/local/aws-cli/
74+
# COPY --from=devopscorner/aws-cli:latest /aws-cli-bin/ /usr/local/bin/
75+
COPY --from=devopscorner/cicd:alpine /root/.tfenv /root/.tfenv
76+
COPY --from=devopscorner/cicd:alpine /usr/local/bin/ /usr/local/bin/
77+
COPY --from=devopscorner/cicd:alpine /usr/local/aws-cli/ /usr/local/aws-cli/
9078
COPY --from=builder-go /go/src/app/goapp /usr/local/bin/k8s-context
79+
COPY --from=builder-go /go/src/app/goapp /usr/local/bin/kc
9180

9281
EXPOSE 22 80 443
9382

‎Dockerfile.alpine-3.15‎

Lines changed: 16 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -19,30 +19,6 @@ RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 \
1919
go build -mod=readonly -ldflags="-s -w" -o goapp
2020

2121

22-
### Builder Python ###
23-
FROM python:3.10.10-alpine${ALPINE_VERSION:-3.16} as builder-python
24-
25-
ARG AWS_CLI_VERSION=2.11.0
26-
RUN apk add --no-cache git unzip groff build-base libffi-dev cmake
27-
RUN git clone --single-branch --depth 1 -b ${AWS_CLI_VERSION} https://github.com/aws/aws-cli.git
28-
29-
WORKDIR aws-cli
30-
RUN python -m venv venv
31-
RUN . venv/bin/activate
32-
RUN scripts/installers/make-exe
33-
RUN unzip -q dist/awscli-exe.zip
34-
RUN aws/install --bin-dir /aws-cli-bin
35-
RUN /aws-cli-bin/aws --version
36-
37-
# reduce image size: remove autocomplete and examples
38-
RUN rm -rf \
39-
/usr/local/aws-cli/v2/current/dist/aws_completer \
40-
/usr/local/aws-cli/v2/current/dist/awscli/data/ac.index \
41-
/usr/local/aws-cli/v2/current/dist/awscli/examples
42-
RUN find /usr/local/aws-cli/v2/current/dist/awscli/data -name completions-1*.json -delete
43-
RUN find /usr/local/aws-cli/v2/current/dist/awscli/botocore/data -name examples-1.json -delete
44-
45-
4622
### Binary ###
4723
# FROM golang:1.19.3-alpine3.15
4824
FROM nginx:${NGINX_VERSION:-1.23-alpine}
@@ -84,10 +60,23 @@ LABEL maintainer="$AUTHOR" \
8460
fr.hbis.docker.base.version="$BUILD_VERSION"
8561

8662
ENV GIN_MODE=release
87-
COPY --from=alpine/k8s:1.26.2 /usr/bin/ /usr/local/bin/
88-
COPY --from=builder-python /usr/local/aws-cli/ /usr/local/aws-cli/
89-
COPY --from=builder-python /aws-cli-bin/ /usr/local/bin/
63+
64+
RUN apk add --no-cache \
65+
build-base \
66+
git \
67+
curl \
68+
make \
69+
bash \
70+
nano
71+
72+
# COPY --from=alpine/k8s:1.26.2 /usr/local/bin/ /usr/local/bin/
73+
# COPY --from=devopscorner/aws-cli:latest /usr/local/aws-cli/ /usr/local/aws-cli/
74+
# COPY --from=devopscorner/aws-cli:latest /aws-cli-bin/ /usr/local/bin/
75+
COPY --from=devopscorner/cicd:alpine /root/.tfenv /root/.tfenv
76+
COPY --from=devopscorner/cicd:alpine /usr/local/bin/ /usr/local/bin/
77+
COPY --from=devopscorner/cicd:alpine /usr/local/aws-cli/ /usr/local/aws-cli/
9078
COPY --from=builder-go /go/src/app/goapp /usr/local/bin/k8s-context
79+
COPY --from=builder-go /go/src/app/goapp /usr/local/bin/kc
9180

9281
EXPOSE 22 80 443
9382

‎Dockerfile.alpine-3.16‎

Lines changed: 16 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -19,30 +19,6 @@ RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 \
1919
go build -mod=readonly -ldflags="-s -w" -o goapp
2020

2121

22-
### Builder Python ###
23-
FROM python:3.10.10-alpine${ALPINE_VERSION:-3.16} as builder-python
24-
25-
ARG AWS_CLI_VERSION=2.11.0
26-
RUN apk add --no-cache git unzip groff build-base libffi-dev cmake
27-
RUN git clone --single-branch --depth 1 -b ${AWS_CLI_VERSION} https://github.com/aws/aws-cli.git
28-
29-
WORKDIR aws-cli
30-
RUN python -m venv venv
31-
RUN . venv/bin/activate
32-
RUN scripts/installers/make-exe
33-
RUN unzip -q dist/awscli-exe.zip
34-
RUN aws/install --bin-dir /aws-cli-bin
35-
RUN /aws-cli-bin/aws --version
36-
37-
# reduce image size: remove autocomplete and examples
38-
RUN rm -rf \
39-
/usr/local/aws-cli/v2/current/dist/aws_completer \
40-
/usr/local/aws-cli/v2/current/dist/awscli/data/ac.index \
41-
/usr/local/aws-cli/v2/current/dist/awscli/examples
42-
RUN find /usr/local/aws-cli/v2/current/dist/awscli/data -name completions-1*.json -delete
43-
RUN find /usr/local/aws-cli/v2/current/dist/awscli/botocore/data -name examples-1.json -delete
44-
45-
4622
### Binary ###
4723
# FROM golang:1.19.5-alpine3.16
4824
FROM nginx:${NGINX_VERSION:-1.23-alpine}
@@ -84,10 +60,23 @@ LABEL maintainer="$AUTHOR" \
8460
fr.hbis.docker.base.version="$BUILD_VERSION"
8561

8662
ENV GIN_MODE=release
87-
COPY --from=alpine/k8s:1.26.2 /usr/bin/ /usr/local/bin/
88-
COPY --from=builder-python /usr/local/aws-cli/ /usr/local/aws-cli/
89-
COPY --from=builder-python /aws-cli-bin/ /usr/local/bin/
63+
64+
RUN apk add --no-cache \
65+
build-base \
66+
git \
67+
curl \
68+
make \
69+
bash \
70+
nano
71+
72+
# COPY --from=alpine/k8s:1.26.2 /usr/local/bin/ /usr/local/bin/
73+
# COPY --from=devopscorner/aws-cli:latest /usr/local/aws-cli/ /usr/local/aws-cli/
74+
# COPY --from=devopscorner/aws-cli:latest /aws-cli-bin/ /usr/local/bin/
75+
COPY --from=devopscorner/cicd:alpine /root/.tfenv /root/.tfenv
76+
COPY --from=devopscorner/cicd:alpine /usr/local/bin/ /usr/local/bin/
77+
COPY --from=devopscorner/cicd:alpine /usr/local/aws-cli/ /usr/local/aws-cli/
9078
COPY --from=builder-go /go/src/app/goapp /usr/local/bin/k8s-context
79+
COPY --from=builder-go /go/src/app/goapp /usr/local/bin/kc
9180

9281
EXPOSE 22 80 443
9382

‎Dockerfile.alpine-3.17‎

Lines changed: 16 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -19,30 +19,6 @@ RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 \
1919
go build -mod=readonly -ldflags="-s -w" -o goapp
2020

2121

22-
### Builder Python ###
23-
FROM python:3.10.10-alpine${ALPINE_VERSION:-3.17} as builder-python
24-
25-
ARG AWS_CLI_VERSION=2.11.0
26-
RUN apk add --no-cache git unzip groff build-base libffi-dev cmake
27-
RUN git clone --single-branch --depth 1 -b ${AWS_CLI_VERSION} https://github.com/aws/aws-cli.git
28-
29-
WORKDIR aws-cli
30-
RUN python -m venv venv
31-
RUN . venv/bin/activate
32-
RUN scripts/installers/make-exe
33-
RUN unzip -q dist/awscli-exe.zip
34-
RUN aws/install --bin-dir /aws-cli-bin
35-
RUN /aws-cli-bin/aws --version
36-
37-
# reduce image size: remove autocomplete and examples
38-
RUN rm -rf \
39-
/usr/local/aws-cli/v2/current/dist/aws_completer \
40-
/usr/local/aws-cli/v2/current/dist/awscli/data/ac.index \
41-
/usr/local/aws-cli/v2/current/dist/awscli/examples
42-
RUN find /usr/local/aws-cli/v2/current/dist/awscli/data -name completions-1*.json -delete
43-
RUN find /usr/local/aws-cli/v2/current/dist/awscli/botocore/data -name examples-1.json -delete
44-
45-
4622
### Binary ###
4723
# FROM golang:1.19.5-alpine3.17
4824
FROM nginx:${NGINX_VERSION:-1.23-alpine}
@@ -84,10 +60,23 @@ LABEL maintainer="$AUTHOR" \
8460
fr.hbis.docker.base.version="$BUILD_VERSION"
8561

8662
ENV GIN_MODE=release
87-
COPY --from=alpine/k8s:1.26.2 /usr/bin/ /usr/local/bin/
88-
COPY --from=builder-python /usr/local/aws-cli/ /usr/local/aws-cli/
89-
COPY --from=builder-python /aws-cli-bin/ /usr/local/bin/
63+
64+
RUN apk add --no-cache \
65+
build-base \
66+
git \
67+
curl \
68+
make \
69+
bash \
70+
nano
71+
72+
# COPY --from=alpine/k8s:1.26.2 /usr/local/bin/ /usr/local/bin/
73+
# COPY --from=devopscorner/aws-cli:latest /usr/local/aws-cli/ /usr/local/aws-cli/
74+
# COPY --from=devopscorner/aws-cli:latest /aws-cli-bin/ /usr/local/bin/
75+
COPY --from=devopscorner/cicd:alpine /root/.tfenv /root/.tfenv
76+
COPY --from=devopscorner/cicd:alpine /usr/local/bin/ /usr/local/bin/
77+
COPY --from=devopscorner/cicd:alpine /usr/local/aws-cli/ /usr/local/aws-cli/
9078
COPY --from=builder-go /go/src/app/goapp /usr/local/bin/k8s-context
79+
COPY --from=builder-go /go/src/app/goapp /usr/local/bin/kc
9180

9281
EXPOSE 22 80 443
9382

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Customize Kubernetes Change Context (KUBECONFIG)
2222

2323
| Image name | Size |
2424
|------------|------|
25-
| `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) ![latest-alpine](https://img.shields.io/static/v1?label=latest&message=alpine&color=orange) |
25+
| `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) |
2626
| `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) ![latest-1.1.3](https://img.shields.io/static/v1?label=latest&message=1.1.3&color=orange) |
2727
| `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) |
2828
| `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) |

‎start-build.sh‎

Lines changed: 10 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -15,41 +15,26 @@ export IMAGE="$CI_PROJECT_PATH/$CI_PROJECT_NAME"
1515
TAG="alpine-3.15"
1616
echo " Build Image => $IMAGE:$TAG"
1717
docker build --no-cache -f Dockerfile.alpine-3.15 -t $IMAGE:$TAG .
18-
echo ""
19-
20-
TAG="go1.19.3-alpine3.15"
21-
echo " Build Image => $IMAGE:$TAG"
22-
docker build --no-cache -f Dockerfile.alpine-3.15 -t $IMAGE:$TAG .
18+
docker tag $IMAGE:$TAG $IMAGE:go1.19-alpine3.15
19+
docker tag $IMAGE:$TAG $IMAGE:go1.19.3-alpine3.15
2320
echo ""
2421

2522
TAG="alpine-3.16"
2623
echo " Build Image => $IMAGE:$TAG"
2724
docker build --no-cache -f Dockerfile.alpine-3.16 -t $IMAGE:$TAG .
28-
echo ""
29-
30-
TAG="go1.19.5-alpine3.16"
31-
echo " Build Image => $IMAGE:$TAG"
32-
docker build --no-cache -f Dockerfile.alpine-3.16 -t $IMAGE:$TAG .
25+
docker tag $IMAGE:$TAG $IMAGE:go1.19-alpine3.16
26+
docker tag $IMAGE:$TAG $IMAGE:go1.19.5-alpine3.16
3327
echo ""
3428

3529
TAG="alpine-3.17"
3630
echo " Build Image => $IMAGE:$TAG"
3731
docker build --no-cache -f Dockerfile.alpine-3.17 -t $IMAGE:$TAG .
38-
echo ""
39-
40-
TAG="go1.19.5-alpine3.17"
41-
echo " Build Image => $IMAGE:$TAG"
42-
docker build --no-cache -f Dockerfile.alpine-3.17 -t $IMAGE:$TAG .
43-
echo ""
44-
45-
TAG="alpine"
46-
echo " Build Image => $IMAGE:$TAG"
47-
docker build --no-cache -f Dockerfile -t $IMAGE:$TAG .
48-
echo ""
49-
50-
TAG="alpine-latest"
51-
echo " Build Image => $IMAGE:$TAG"
52-
docker build --no-cache -f Dockerfile -t $IMAGE:$TAG .
32+
docker tag $IMAGE:$TAG $IMAGE:go1.19-alpine3.17
33+
docker tag $IMAGE:$TAG $IMAGE:go1.19.5-alpine3.17
34+
docker tag $IMAGE:$TAG $IMAGE:alpine
35+
docker tag $IMAGE:$TAG $IMAGE:alpine-latest
36+
docker tag $IMAGE:$TAG $IMAGE:latest
37+
docker tag $IMAGE:$TAG $IMAGE:1.1.3
5338
echo ""
5439

5540
echo "Cleanup Unknown Tags"

0 commit comments

Comments
 (0)