From 9a4737bf61a80c13f20937b908a3dafaaa8ebb1a Mon Sep 17 00:00:00 2001 From: "Dwi Fahni Denni (dfdenni)" Date: Fri, 3 Mar 2023 14:51:50 +0700 Subject: [PATCH 01/19] Release/v2.9.4 (#50) * Added container aws-cli for alpine 3.17 & update binary version * Added codebuild-5.0 && refactoring binary version * Refactoring phpfpm container 8.1 * Added docker-compose cicd-codebuild * Update documentation for AWS Cli container * Refactoring ci/cd container devopscorner * Update changelogs version * Fixing builder container for devopscorner/cicd alpine * Fixing binary tfsec with spesific version From f2d43cbbc9d7b00bc13d779ff680df07866da5cc Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Fri, 3 Mar 2023 12:11:52 +0000 Subject: [PATCH 02/19] Automated clone.json update --- clone.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/clone.json b/clone.json index 09d6b441..a48a7438 100644 --- a/clone.json +++ b/clone.json @@ -1,11 +1,11 @@ { - "count": 325, - "uniques": 71, + "count": 328, + "uniques": 70, "clones": [ { "timestamp": "2023-02-17T00:00:00Z", - "count": 23, - "uniques": 9 + "count": 7, + "uniques": 5 }, { "timestamp": "2023-02-18T00:00:00Z", @@ -74,8 +74,8 @@ }, { "timestamp": "2023-03-03T00:00:00Z", - "count": 5, - "uniques": 3 + "count": 24, + "uniques": 10 } ] } From be408907f9a522455fbbb1d662f1a678bc27ecbe Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Fri, 3 Mar 2023 18:08:30 +0000 Subject: [PATCH 03/19] Automated clone.json update --- clone.json | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/clone.json b/clone.json index a48a7438..ee5bc8b0 100644 --- a/clone.json +++ b/clone.json @@ -1,12 +1,7 @@ { - "count": 328, - "uniques": 70, + "count": 327, + "uniques": 68, "clones": [ - { - "timestamp": "2023-02-17T00:00:00Z", - "count": 7, - "uniques": 5 - }, { "timestamp": "2023-02-18T00:00:00Z", "count": 21, @@ -74,8 +69,8 @@ }, { "timestamp": "2023-03-03T00:00:00Z", - "count": 24, - "uniques": 10 + "count": 30, + "uniques": 12 } ] } From cb27978eecb09959629d48266cdfb441812bb523 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Sat, 4 Mar 2023 00:34:36 +0000 Subject: [PATCH 04/19] Automated clone.json update --- clone.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/clone.json b/clone.json index ee5bc8b0..b436c633 100644 --- a/clone.json +++ b/clone.json @@ -4,8 +4,8 @@ "clones": [ { "timestamp": "2023-02-18T00:00:00Z", - "count": 21, - "uniques": 9 + "count": 16, + "uniques": 8 }, { "timestamp": "2023-02-19T00:00:00Z", @@ -69,7 +69,7 @@ }, { "timestamp": "2023-03-03T00:00:00Z", - "count": 30, + "count": 35, "uniques": 12 } ] From 49061846c79a5f94c44b6a75360eaebf86d7d85e Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Sat, 4 Mar 2023 06:07:52 +0000 Subject: [PATCH 05/19] Automated clone.json update --- clone.json | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/clone.json b/clone.json index b436c633..191d59cc 100644 --- a/clone.json +++ b/clone.json @@ -1,11 +1,11 @@ { - "count": 327, - "uniques": 68, + "count": 326, + "uniques": 67, "clones": [ { "timestamp": "2023-02-18T00:00:00Z", - "count": 16, - "uniques": 8 + "count": 10, + "uniques": 5 }, { "timestamp": "2023-02-19T00:00:00Z", @@ -71,6 +71,11 @@ "timestamp": "2023-03-03T00:00:00Z", "count": 35, "uniques": 12 + }, + { + "timestamp": "2023-03-04T00:00:00Z", + "count": 5, + "uniques": 3 } ] } From 8edb7ef2b2ef2e3accbd8a163f1b6dc6c4fc0ba0 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Sat, 4 Mar 2023 12:10:44 +0000 Subject: [PATCH 06/19] Automated clone.json update --- clone.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/clone.json b/clone.json index 191d59cc..761a2c77 100644 --- a/clone.json +++ b/clone.json @@ -1,11 +1,11 @@ { - "count": 326, - "uniques": 67, + "count": 325, + "uniques": 68, "clones": [ { "timestamp": "2023-02-18T00:00:00Z", - "count": 10, - "uniques": 5 + "count": 5, + "uniques": 3 }, { "timestamp": "2023-02-19T00:00:00Z", @@ -74,8 +74,8 @@ }, { "timestamp": "2023-03-04T00:00:00Z", - "count": 5, - "uniques": 3 + "count": 9, + "uniques": 5 } ] } From 6474da01b4ac68a1f7161de8db52012557ecd85a Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Sat, 4 Mar 2023 18:07:29 +0000 Subject: [PATCH 07/19] Automated clone.json update --- clone.json | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/clone.json b/clone.json index 761a2c77..c276b8dc 100644 --- a/clone.json +++ b/clone.json @@ -2,11 +2,6 @@ "count": 325, "uniques": 68, "clones": [ - { - "timestamp": "2023-02-18T00:00:00Z", - "count": 5, - "uniques": 3 - }, { "timestamp": "2023-02-19T00:00:00Z", "count": 21, @@ -74,8 +69,8 @@ }, { "timestamp": "2023-03-04T00:00:00Z", - "count": 9, - "uniques": 5 + "count": 14, + "uniques": 7 } ] } From 114b647583d90386f2955d3ad920fb784e8c5314 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Sun, 5 Mar 2023 00:40:01 +0000 Subject: [PATCH 08/19] Automated clone.json update --- clone.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/clone.json b/clone.json index c276b8dc..77df38d9 100644 --- a/clone.json +++ b/clone.json @@ -4,8 +4,8 @@ "clones": [ { "timestamp": "2023-02-19T00:00:00Z", - "count": 21, - "uniques": 9 + "count": 16, + "uniques": 8 }, { "timestamp": "2023-02-20T00:00:00Z", @@ -69,8 +69,8 @@ }, { "timestamp": "2023-03-04T00:00:00Z", - "count": 14, - "uniques": 7 + "count": 19, + "uniques": 9 } ] } From 1e494efc9607e0ea70cebf19c29766ab2cadd7f7 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Sun, 5 Mar 2023 06:08:00 +0000 Subject: [PATCH 09/19] Automated clone.json update --- clone.json | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/clone.json b/clone.json index 77df38d9..3b4073f4 100644 --- a/clone.json +++ b/clone.json @@ -1,11 +1,11 @@ { - "count": 325, - "uniques": 68, + "count": 324, + "uniques": 66, "clones": [ { "timestamp": "2023-02-19T00:00:00Z", - "count": 16, - "uniques": 8 + "count": 10, + "uniques": 5 }, { "timestamp": "2023-02-20T00:00:00Z", @@ -71,6 +71,11 @@ "timestamp": "2023-03-04T00:00:00Z", "count": 19, "uniques": 9 + }, + { + "timestamp": "2023-03-05T00:00:00Z", + "count": 5, + "uniques": 3 } ] } From 03b8be98767c44750f1213adf2d5c5a096419092 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Sun, 5 Mar 2023 12:11:00 +0000 Subject: [PATCH 10/19] Automated clone.json update --- clone.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/clone.json b/clone.json index 3b4073f4..5b3fca61 100644 --- a/clone.json +++ b/clone.json @@ -1,11 +1,11 @@ { - "count": 324, - "uniques": 66, + "count": 327, + "uniques": 67, "clones": [ { "timestamp": "2023-02-19T00:00:00Z", - "count": 10, - "uniques": 5 + "count": 5, + "uniques": 3 }, { "timestamp": "2023-02-20T00:00:00Z", @@ -74,8 +74,8 @@ }, { "timestamp": "2023-03-05T00:00:00Z", - "count": 5, - "uniques": 3 + "count": 13, + "uniques": 7 } ] } From 99553f3d3eed113a07274da155db2fc0a2ebbfc7 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Sun, 5 Mar 2023 18:07:24 +0000 Subject: [PATCH 11/19] Automated clone.json update --- clone.json | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/clone.json b/clone.json index 5b3fca61..795b1ccb 100644 --- a/clone.json +++ b/clone.json @@ -2,11 +2,6 @@ "count": 327, "uniques": 67, "clones": [ - { - "timestamp": "2023-02-19T00:00:00Z", - "count": 5, - "uniques": 3 - }, { "timestamp": "2023-02-20T00:00:00Z", "count": 22, @@ -74,8 +69,8 @@ }, { "timestamp": "2023-03-05T00:00:00Z", - "count": 13, - "uniques": 7 + "count": 18, + "uniques": 8 } ] } From 1bf70f1f91c1551f674c2db551dc787636faba31 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Mon, 6 Mar 2023 00:36:44 +0000 Subject: [PATCH 12/19] Automated clone.json update --- clone.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/clone.json b/clone.json index 795b1ccb..80e9d984 100644 --- a/clone.json +++ b/clone.json @@ -1,11 +1,11 @@ { - "count": 327, - "uniques": 67, + "count": 329, + "uniques": 68, "clones": [ { "timestamp": "2023-02-20T00:00:00Z", - "count": 22, - "uniques": 10 + "count": 17, + "uniques": 9 }, { "timestamp": "2023-02-21T00:00:00Z", @@ -69,8 +69,8 @@ }, { "timestamp": "2023-03-05T00:00:00Z", - "count": 18, - "uniques": 8 + "count": 25, + "uniques": 11 } ] } From 5048bc7f41864c810806273bf0f9c45549d99aae Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Mon, 6 Mar 2023 06:09:38 +0000 Subject: [PATCH 13/19] Automated clone.json update --- clone.json | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/clone.json b/clone.json index 80e9d984..8a9843de 100644 --- a/clone.json +++ b/clone.json @@ -1,11 +1,11 @@ { "count": 329, - "uniques": 68, + "uniques": 67, "clones": [ { "timestamp": "2023-02-20T00:00:00Z", - "count": 17, - "uniques": 9 + "count": 12, + "uniques": 7 }, { "timestamp": "2023-02-21T00:00:00Z", @@ -71,6 +71,11 @@ "timestamp": "2023-03-05T00:00:00Z", "count": 25, "uniques": 11 + }, + { + "timestamp": "2023-03-06T00:00:00Z", + "count": 5, + "uniques": 3 } ] } From 5c7875e9791982c28402e17d202853f7cca7ca17 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Mon, 6 Mar 2023 12:12:35 +0000 Subject: [PATCH 14/19] Automated clone.json update --- clone.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/clone.json b/clone.json index 8a9843de..e1d8fa7f 100644 --- a/clone.json +++ b/clone.json @@ -4,8 +4,8 @@ "clones": [ { "timestamp": "2023-02-20T00:00:00Z", - "count": 12, - "uniques": 7 + "count": 6, + "uniques": 4 }, { "timestamp": "2023-02-21T00:00:00Z", @@ -74,8 +74,8 @@ }, { "timestamp": "2023-03-06T00:00:00Z", - "count": 5, - "uniques": 3 + "count": 11, + "uniques": 6 } ] } From 858266f75ad262f820b90f1cba4a18cc9e48a9a7 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Mon, 6 Mar 2023 18:08:46 +0000 Subject: [PATCH 15/19] Automated clone.json update --- clone.json | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/clone.json b/clone.json index e1d8fa7f..7b4ffd25 100644 --- a/clone.json +++ b/clone.json @@ -1,12 +1,7 @@ { - "count": 329, - "uniques": 67, + "count": 328, + "uniques": 66, "clones": [ - { - "timestamp": "2023-02-20T00:00:00Z", - "count": 6, - "uniques": 4 - }, { "timestamp": "2023-02-21T00:00:00Z", "count": 26, @@ -74,8 +69,8 @@ }, { "timestamp": "2023-03-06T00:00:00Z", - "count": 11, - "uniques": 6 + "count": 16, + "uniques": 8 } ] } From e1be7c5acff1db55b7e511c356db2317f2134dce Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Tue, 7 Mar 2023 00:38:39 +0000 Subject: [PATCH 16/19] Automated clone.json update --- clone.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/clone.json b/clone.json index 7b4ffd25..830cf07b 100644 --- a/clone.json +++ b/clone.json @@ -1,11 +1,11 @@ { "count": 328, - "uniques": 66, + "uniques": 65, "clones": [ { "timestamp": "2023-02-21T00:00:00Z", - "count": 26, - "uniques": 11 + "count": 21, + "uniques": 9 }, { "timestamp": "2023-02-22T00:00:00Z", @@ -69,8 +69,8 @@ }, { "timestamp": "2023-03-06T00:00:00Z", - "count": 16, - "uniques": 8 + "count": 21, + "uniques": 10 } ] } From 95463584f7b1811dc76ad24cbfbf575c62e8d66d Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Tue, 7 Mar 2023 06:09:01 +0000 Subject: [PATCH 17/19] Automated clone.json update --- clone.json | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/clone.json b/clone.json index 830cf07b..75854eb1 100644 --- a/clone.json +++ b/clone.json @@ -1,11 +1,11 @@ { - "count": 328, + "count": 326, "uniques": 65, "clones": [ { "timestamp": "2023-02-21T00:00:00Z", - "count": 21, - "uniques": 9 + "count": 14, + "uniques": 7 }, { "timestamp": "2023-02-22T00:00:00Z", @@ -71,6 +71,11 @@ "timestamp": "2023-03-06T00:00:00Z", "count": 21, "uniques": 10 + }, + { + "timestamp": "2023-03-07T00:00:00Z", + "count": 5, + "uniques": 3 } ] } From 30a754f14559e8bbac83d4b5f085b3e6095518c8 Mon Sep 17 00:00:00 2001 From: "Dwi Fahni Denni (dfdenni)" Date: Tue, 7 Mar 2023 15:50:22 +0700 Subject: [PATCH 18/19] Develop (#51) * Refactoring docker-compose sock, chmod execute files & refactoring scripts * Refactoring container build & makefile script * Refactoring indentation scripts * Refactoring docker-compose indentation & fixing dockerfile nifi and nifi-registry for awscli-v2 installation * Added cleanup orphant docker images / none / unknown tags * Fixing taggination script * Update container airflow * Fixing airflow container configuration * Update changelog history * Update badges * Restore docker-compose airflow configuration from official airflow docker-compose * Added sftp container alpine * Update docker build image to clean orphand tags * Added custom config for mariadb & postgresql * Refactoring script for ecr AWS_REGION * Added container aws-cli for alpine 3.17 & update binary version * Added codebuild-5.0 && refactoring binary version * Refactoring phpfpm container 8.1 * Added docker-compose cicd-codebuild * Update documentation for AWS Cli container * Refactoring ci/cd container devopscorner * Update changelogs version * Fixing builder container for devopscorner/cicd alpine * Fixing binary tfsec with spesific version * Update binary AWS CLI version to 2.11.0 * Update binary AWS CLI version to 2.11.0 * Update binary AWS CLI version to 2.11.0 --- CHANGELOG.md | 11 +++++++++ README.md | 2 +- compose/docker/airflow-ubuntu/Dockerfile | 2 +- compose/docker/aws-cli/Dockerfile | 2 +- compose/docker/aws-cli/Dockerfile-Alpine-3.16 | 2 +- compose/docker/aws-cli/Dockerfile-Alpine-3.17 | 2 +- compose/docker/aws-cli/start-build.sh | 12 +++++----- compose/docker/cicd-alpine/Dockerfile | 2 +- .../docker/cicd-alpine/Dockerfile-Alpine-3.15 | 2 +- .../cicd-alpine/Dockerfile-Alpine-3.15-AWX | 2 +- .../Dockerfile-Alpine-3.15-Ansible-Tower | 2 +- .../docker/cicd-alpine/Dockerfile-Alpine-3.16 | 2 +- .../cicd-alpine/Dockerfile-Alpine-3.16-AWX | 2 +- .../Dockerfile-Alpine-3.16-Ansible-Tower | 2 +- .../docker/cicd-alpine/Dockerfile-Alpine-3.17 | 2 +- .../cicd-alpine/Dockerfile-Alpine-3.17-AWX | 2 +- .../Dockerfile-Alpine-3.17-Ansible-Tower | 2 +- compose/docker/cicd-alpine/start-build.sh | 11 ++++++--- compose/docker/cicd-codebuild/Dockerfile | 2 +- .../cicd-codebuild/Dockerfile-CodeBuild-2.0 | 2 +- .../cicd-codebuild/Dockerfile-CodeBuild-3.0 | 2 +- .../cicd-codebuild/Dockerfile-CodeBuild-4.0 | 2 +- .../cicd-codebuild/Dockerfile-CodeBuild-5.0 | 2 +- compose/docker/cicd-codebuild/start-build.sh | 5 ++++ compose/docker/cicd-ubuntu/Dockerfile | 2 +- .../cicd-ubuntu/Dockerfile-Ubuntu-16.04 | 2 +- .../cicd-ubuntu/Dockerfile-Ubuntu-18.04 | 2 +- .../cicd-ubuntu/Dockerfile-Ubuntu-20.04 | 2 +- .../cicd-ubuntu/Dockerfile-Ubuntu-22.04 | 2 +- compose/docker/nifi-registry/Dockerfile | 2 +- compose/docker/nifi-registry/Dockerfile-1.16 | 2 +- compose/docker/nifi-registry/Dockerfile-1.17 | 2 +- compose/docker/nifi-registry/Dockerfile-1.18 | 2 +- compose/docker/nifi/Dockerfile | 2 +- compose/docker/nifi/Dockerfile-1.16 | 2 +- compose/docker/nifi/Dockerfile-1.17 | 2 +- compose/docker/nifi/Dockerfile-1.18 | 2 +- compose/ecr-build.sh | 2 +- compose/ecr-pull.sh | 2 +- compose/ecr-push.sh | 2 +- compose/ecr-tag.sh | 2 +- docs/README-AWS-Cli.md | 23 +++++++++++++++---- docs/README-Airflow.md | 4 ++-- 43 files changed, 88 insertions(+), 52 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fb4cee3b..cc124dd0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,17 @@ --- +## Features - v2.9.5 + +- All features from version 2.9.4 +- Update binary + ``` + AWS_CLI_VERSION=2.11.0 + ``` +- Fixing builder script for container `devopscorner/cicd` + +--- + ## Features - v2.9.4 - All features from version 2.9.3 diff --git a/README.md b/README.md index 85b97920..6b79affa 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ DevOpsCorner.id Container Images ![all contributors](https://img.shields.io/github/contributors/devopscorner/devopscorner-container) ![tags](https://img.shields.io/github/v/tag/devopscorner/devopscorner-container?sort=semver) ![download all](https://img.shields.io/github/downloads/devopscorner/devopscorner-container/total.svg) -![download latest](https://img.shields.io/github/downloads/devopscorner/devopscorner-container/2.9.4/total) +![download latest](https://img.shields.io/github/downloads/devopscorner/devopscorner-container/2.9.5/total) ![view](https://views.whatilearened.today/views/github/devopscorner/devopscorner-container.svg) ![clone](https://img.shields.io/badge/dynamic/json?color=success&label=clone&query=count&url=https://raw.githubusercontent.com/devopscorner/devopscorner-container/master/clone.json?raw=True&logo=github) ![issues](https://img.shields.io/github/issues/devopscorner/devopscorner-container) diff --git a/compose/docker/airflow-ubuntu/Dockerfile b/compose/docker/airflow-ubuntu/Dockerfile index a8fad763..2ef17981 100644 --- a/compose/docker/airflow-ubuntu/Dockerfile +++ b/compose/docker/airflow-ubuntu/Dockerfile @@ -12,7 +12,7 @@ ENV IMG_VERSION="2.5.0" ENV IMG_DESC="Docker Image Airflow 2.5.0 with Python-3.10" ENV IMG_ARCH="amd64/x86_64" -ENV AWS_CLI_VERSION=2.9.1 +ENV AWS_CLI_VERSION=2.11.0 ENV AIRFLOW_VERSION=2.5.0 ENV VERIFY_CHECKSUM=false diff --git a/compose/docker/aws-cli/Dockerfile b/compose/docker/aws-cli/Dockerfile index 6f7d7a0a..915c3a86 100644 --- a/compose/docker/aws-cli/Dockerfile +++ b/compose/docker/aws-cli/Dockerfile @@ -7,7 +7,7 @@ ARG ALPINE_VERSION=3.17 ### Builder ### FROM python:3.10.10-alpine${ALPINE_VERSION} as builder -ARG AWS_CLI_VERSION=2.10.0 +ARG AWS_CLI_VERSION=2.11.0 RUN apk add --no-cache git unzip groff build-base libffi-dev cmake RUN git clone --single-branch --depth 1 -b ${AWS_CLI_VERSION} https://github.com/aws/aws-cli.git diff --git a/compose/docker/aws-cli/Dockerfile-Alpine-3.16 b/compose/docker/aws-cli/Dockerfile-Alpine-3.16 index a329023a..2190d0e4 100644 --- a/compose/docker/aws-cli/Dockerfile-Alpine-3.16 +++ b/compose/docker/aws-cli/Dockerfile-Alpine-3.16 @@ -7,7 +7,7 @@ ARG ALPINE_VERSION=3.16 ### Builder ### FROM python:3.10.10-alpine${ALPINE_VERSION} as builder -ARG AWS_CLI_VERSION=2.10.0 +ARG AWS_CLI_VERSION=2.11.0 RUN apk add --no-cache git unzip groff build-base libffi-dev cmake RUN git clone --single-branch --depth 1 -b ${AWS_CLI_VERSION} https://github.com/aws/aws-cli.git diff --git a/compose/docker/aws-cli/Dockerfile-Alpine-3.17 b/compose/docker/aws-cli/Dockerfile-Alpine-3.17 index 6f7d7a0a..915c3a86 100644 --- a/compose/docker/aws-cli/Dockerfile-Alpine-3.17 +++ b/compose/docker/aws-cli/Dockerfile-Alpine-3.17 @@ -7,7 +7,7 @@ ARG ALPINE_VERSION=3.17 ### Builder ### FROM python:3.10.10-alpine${ALPINE_VERSION} as builder -ARG AWS_CLI_VERSION=2.10.0 +ARG AWS_CLI_VERSION=2.11.0 RUN apk add --no-cache git unzip groff build-base libffi-dev cmake RUN git clone --single-branch --depth 1 -b ${AWS_CLI_VERSION} https://github.com/aws/aws-cli.git diff --git a/compose/docker/aws-cli/start-build.sh b/compose/docker/aws-cli/start-build.sh index 7264cb91..966c787b 100755 --- a/compose/docker/aws-cli/start-build.sh +++ b/compose/docker/aws-cli/start-build.sh @@ -15,18 +15,18 @@ export IMAGE="$CI_PROJECT_PATH/$CI_PROJECT_NAME" TAG="alpine-3.17" echo " Build Image => $IMAGE:$TAG" docker build --no-cache -f Dockerfile-Alpine-3.17 -t $IMAGE:$TAG . -docker tag $IMAGE:$TAG $IMAGE:alpine3.17-2.10.0 -docker tag $IMAGE:$TAG $IMAGE:alpine3.17-python3.10.10-2.10.0 -docker tag $IMAGE:$TAG $IMAGE:2.10.0 +docker tag $IMAGE:$TAG $IMAGE:alpine3.17-2.11.0 +docker tag $IMAGE:$TAG $IMAGE:alpine3.17-python3.10.10-2.11.0 +docker tag $IMAGE:$TAG $IMAGE:2.11.0 docker tag $IMAGE:$TAG $IMAGE:python3.10.10 -docker tag $IMAGE:$TAG $IMAGE:python3.10.10-2.10.0 +docker tag $IMAGE:$TAG $IMAGE:python3.10.10-2.11.0 echo "" TAG="alpine-3.16" echo " Build Image => $IMAGE:$TAG" docker build --no-cache -f Dockerfile-Alpine-3.16 -t $IMAGE:$TAG . -docker tag $IMAGE:$TAG $IMAGE:alpine3.16-2.10.0 -docker tag $IMAGE:$TAG $IMAGE:alpine3.16-python3.10.10-2.10.0 +docker tag $IMAGE:$TAG $IMAGE:alpine3.16-2.11.0 +docker tag $IMAGE:$TAG $IMAGE:alpine3.16-python3.10.10-2.11.0 echo "" TAG="latest" diff --git a/compose/docker/cicd-alpine/Dockerfile b/compose/docker/cicd-alpine/Dockerfile index b34df636..0a2fa45e 100644 --- a/compose/docker/cicd-alpine/Dockerfile +++ b/compose/docker/cicd-alpine/Dockerfile @@ -51,7 +51,7 @@ ENV TERRASCAN_VERSION=1.17.0 ENV HELMFILE_VERSION=0.144.0 ENV KUBECTL_VERSION=1.25.4 ENV CHECKOV_VERSION=2.1.244 -ENV AWS_CLI_VERSION=2.9.1 +ENV AWS_CLI_VERSION=2.11.0 ENV VERIFY_CHECKSUM=false USER root diff --git a/compose/docker/cicd-alpine/Dockerfile-Alpine-3.15 b/compose/docker/cicd-alpine/Dockerfile-Alpine-3.15 index 84a25389..cd81bcae 100644 --- a/compose/docker/cicd-alpine/Dockerfile-Alpine-3.15 +++ b/compose/docker/cicd-alpine/Dockerfile-Alpine-3.15 @@ -51,7 +51,7 @@ ENV TERRASCAN_VERSION=1.17.0 ENV HELMFILE_VERSION=0.144.0 ENV KUBECTL_VERSION=1.25.4 ENV CHECKOV_VERSION=2.1.244 -ENV AWS_CLI_VERSION=2.9.1 +ENV AWS_CLI_VERSION=2.11.0 ENV TFSEC_VERSION=1.28 ENV VERIFY_CHECKSUM=false diff --git a/compose/docker/cicd-alpine/Dockerfile-Alpine-3.15-AWX b/compose/docker/cicd-alpine/Dockerfile-Alpine-3.15-AWX index 84a25389..cd81bcae 100644 --- a/compose/docker/cicd-alpine/Dockerfile-Alpine-3.15-AWX +++ b/compose/docker/cicd-alpine/Dockerfile-Alpine-3.15-AWX @@ -51,7 +51,7 @@ ENV TERRASCAN_VERSION=1.17.0 ENV HELMFILE_VERSION=0.144.0 ENV KUBECTL_VERSION=1.25.4 ENV CHECKOV_VERSION=2.1.244 -ENV AWS_CLI_VERSION=2.9.1 +ENV AWS_CLI_VERSION=2.11.0 ENV TFSEC_VERSION=1.28 ENV VERIFY_CHECKSUM=false diff --git a/compose/docker/cicd-alpine/Dockerfile-Alpine-3.15-Ansible-Tower b/compose/docker/cicd-alpine/Dockerfile-Alpine-3.15-Ansible-Tower index 7769dbba..09d6235d 100644 --- a/compose/docker/cicd-alpine/Dockerfile-Alpine-3.15-Ansible-Tower +++ b/compose/docker/cicd-alpine/Dockerfile-Alpine-3.15-Ansible-Tower @@ -50,7 +50,7 @@ ENV TERRASCAN_VERSION=1.17.0 ENV HELMFILE_VERSION=0.144.0 ENV KUBECTL_VERSION=1.25.4 ENV CHECKOV_VERSION=2.1.244 -ENV AWS_CLI_VERSION=2.9.1 +ENV AWS_CLI_VERSION=2.11.0 ENV TFSEC_VERSION=1.28 ENV VERIFY_CHECKSUM=false diff --git a/compose/docker/cicd-alpine/Dockerfile-Alpine-3.16 b/compose/docker/cicd-alpine/Dockerfile-Alpine-3.16 index cddbcfe0..f4c09fe5 100644 --- a/compose/docker/cicd-alpine/Dockerfile-Alpine-3.16 +++ b/compose/docker/cicd-alpine/Dockerfile-Alpine-3.16 @@ -51,7 +51,7 @@ ENV TERRASCAN_VERSION=1.17.0 ENV HELMFILE_VERSION=0.144.0 ENV KUBECTL_VERSION=1.25.4 ENV CHECKOV_VERSION=2.1.244 -ENV AWS_CLI_VERSION=2.9.1 +ENV AWS_CLI_VERSION=2.11.0 ENV TFSEC_VERSION=1.28 ENV VERIFY_CHECKSUM=false diff --git a/compose/docker/cicd-alpine/Dockerfile-Alpine-3.16-AWX b/compose/docker/cicd-alpine/Dockerfile-Alpine-3.16-AWX index cddbcfe0..f4c09fe5 100644 --- a/compose/docker/cicd-alpine/Dockerfile-Alpine-3.16-AWX +++ b/compose/docker/cicd-alpine/Dockerfile-Alpine-3.16-AWX @@ -51,7 +51,7 @@ ENV TERRASCAN_VERSION=1.17.0 ENV HELMFILE_VERSION=0.144.0 ENV KUBECTL_VERSION=1.25.4 ENV CHECKOV_VERSION=2.1.244 -ENV AWS_CLI_VERSION=2.9.1 +ENV AWS_CLI_VERSION=2.11.0 ENV TFSEC_VERSION=1.28 ENV VERIFY_CHECKSUM=false diff --git a/compose/docker/cicd-alpine/Dockerfile-Alpine-3.16-Ansible-Tower b/compose/docker/cicd-alpine/Dockerfile-Alpine-3.16-Ansible-Tower index e8c4b860..aa9c31ad 100644 --- a/compose/docker/cicd-alpine/Dockerfile-Alpine-3.16-Ansible-Tower +++ b/compose/docker/cicd-alpine/Dockerfile-Alpine-3.16-Ansible-Tower @@ -50,7 +50,7 @@ ENV TERRASCAN_VERSION=1.17.0 ENV HELMFILE_VERSION=0.144.0 ENV KUBECTL_VERSION=1.25.4 ENV CHECKOV_VERSION=2.1.244 -ENV AWS_CLI_VERSION=2.9.1 +ENV AWS_CLI_VERSION=2.11.0 ENV TFSEC_VERSION=1.28 ENV VERIFY_CHECKSUM=false diff --git a/compose/docker/cicd-alpine/Dockerfile-Alpine-3.17 b/compose/docker/cicd-alpine/Dockerfile-Alpine-3.17 index 433e38e0..83e12c61 100644 --- a/compose/docker/cicd-alpine/Dockerfile-Alpine-3.17 +++ b/compose/docker/cicd-alpine/Dockerfile-Alpine-3.17 @@ -51,7 +51,7 @@ ENV TERRASCAN_VERSION=1.17.0 ENV HELMFILE_VERSION=0.144.0 ENV KUBECTL_VERSION=1.25.4 ENV CHECKOV_VERSION=2.1.244 -ENV AWS_CLI_VERSION=2.9.1 +ENV AWS_CLI_VERSION=2.11.0 ENV TFSEC_VERSION=1.28 ENV VERIFY_CHECKSUM=false diff --git a/compose/docker/cicd-alpine/Dockerfile-Alpine-3.17-AWX b/compose/docker/cicd-alpine/Dockerfile-Alpine-3.17-AWX index 433e38e0..83e12c61 100644 --- a/compose/docker/cicd-alpine/Dockerfile-Alpine-3.17-AWX +++ b/compose/docker/cicd-alpine/Dockerfile-Alpine-3.17-AWX @@ -51,7 +51,7 @@ ENV TERRASCAN_VERSION=1.17.0 ENV HELMFILE_VERSION=0.144.0 ENV KUBECTL_VERSION=1.25.4 ENV CHECKOV_VERSION=2.1.244 -ENV AWS_CLI_VERSION=2.9.1 +ENV AWS_CLI_VERSION=2.11.0 ENV TFSEC_VERSION=1.28 ENV VERIFY_CHECKSUM=false diff --git a/compose/docker/cicd-alpine/Dockerfile-Alpine-3.17-Ansible-Tower b/compose/docker/cicd-alpine/Dockerfile-Alpine-3.17-Ansible-Tower index 4364d52b..3eb4909c 100644 --- a/compose/docker/cicd-alpine/Dockerfile-Alpine-3.17-Ansible-Tower +++ b/compose/docker/cicd-alpine/Dockerfile-Alpine-3.17-Ansible-Tower @@ -50,7 +50,7 @@ ENV TERRASCAN_VERSION=1.17.0 ENV HELMFILE_VERSION=0.144.0 ENV KUBECTL_VERSION=1.25.4 ENV CHECKOV_VERSION=2.1.244 -ENV AWS_CLI_VERSION=2.9.1 +ENV AWS_CLI_VERSION=2.11.0 ENV TFSEC_VERSION=1.28 ENV VERIFY_CHECKSUM=false diff --git a/compose/docker/cicd-alpine/start-build.sh b/compose/docker/cicd-alpine/start-build.sh index 5cb4aee6..5cbfa974 100755 --- a/compose/docker/cicd-alpine/start-build.sh +++ b/compose/docker/cicd-alpine/start-build.sh @@ -25,7 +25,7 @@ echo "" TAG="alpine-3.16-AnsibleTower" echo " Build Image => $IMAGE:$TAG" -docker build --no-cache -f Dockerfile-Alpine-3.16-Ansible-Tower -t +docker build --no-cache -f Dockerfile-Alpine-3.16-Ansible-Tower -t $IMAGE:$TAG . echo "" TAG="alpine-3.16-AWX" @@ -36,12 +36,12 @@ echo "" TAG="alpine-3.17-AnsibleTower" echo " Build Image => $IMAGE:$TAG" -docker build --no-cache -f Dockerfile-Alpine-3.17-Ansible-Tower -t +docker build --no-cache -f Dockerfile-Alpine-3.17-Ansible-Tower -t $IMAGE:$TAG . echo "" TAG="alpine-3.17-AWX" echo " Build Image => $IMAGE:$TAG" -docker build --no-cache -f Dockerfile-Alpine-3.17-AWX -t +docker build --no-cache -f Dockerfile-Alpine-3.17-AWX -t $IMAGE:$TAG . echo "" TAG="alpine-nginx-1.23" @@ -59,4 +59,9 @@ echo "docker images -a | grep none | awk '{ print $3; }' | xargs docker rmi" docker images -a | grep none | awk '{ print $3; }' | xargs docker rmi echo "" +echo "Cleanup Unknown Tags" +echo "docker images -a | grep none | awk '{ print $3; }' | xargs docker rmi" +docker images -a | grep none | awk '{ print $3; }' | xargs docker rmi +echo "" + echo "-- ALL DONE --" diff --git a/compose/docker/cicd-codebuild/Dockerfile b/compose/docker/cicd-codebuild/Dockerfile index a929b519..ace762b3 100644 --- a/compose/docker/cicd-codebuild/Dockerfile +++ b/compose/docker/cicd-codebuild/Dockerfile @@ -50,7 +50,7 @@ ENV TERRASCAN_VERSION=1.18.0 ENV HELMFILE_VERSION=v0.145.0 ENV KUBECTL_VERSION=v1.26.1 ENV CHECKOV_VERSION=2.3.21 -ENV AWS_CLI_VERSION=2.10.0 +ENV AWS_CLI_VERSION=2.11.0 ENV VERIFY_CHECKSUM=false USER root diff --git a/compose/docker/cicd-codebuild/Dockerfile-CodeBuild-2.0 b/compose/docker/cicd-codebuild/Dockerfile-CodeBuild-2.0 index 88ba693f..a65a0893 100644 --- a/compose/docker/cicd-codebuild/Dockerfile-CodeBuild-2.0 +++ b/compose/docker/cicd-codebuild/Dockerfile-CodeBuild-2.0 @@ -50,7 +50,7 @@ ENV TERRASCAN_VERSION=1.18.0 ENV HELMFILE_VERSION=v0.144.0 ENV KUBECTL_VERSION=v1.26.1 ENV CHECKOV_VERSION=2.3.21 -ENV AWS_CLI_VERSION=2.10.0 +ENV AWS_CLI_VERSION=2.11.0 ENV VERIFY_CHECKSUM=false USER root diff --git a/compose/docker/cicd-codebuild/Dockerfile-CodeBuild-3.0 b/compose/docker/cicd-codebuild/Dockerfile-CodeBuild-3.0 index 1252ab63..b43390c6 100644 --- a/compose/docker/cicd-codebuild/Dockerfile-CodeBuild-3.0 +++ b/compose/docker/cicd-codebuild/Dockerfile-CodeBuild-3.0 @@ -50,7 +50,7 @@ ENV TERRASCAN_VERSION=1.18.0 ENV HELMFILE_VERSION=v0.144.0 ENV KUBECTL_VERSION=v1.26.1 ENV CHECKOV_VERSION=2.3.21 -ENV AWS_CLI_VERSION=2.10.0 +ENV AWS_CLI_VERSION=2.11.0 ENV VERIFY_CHECKSUM=false USER root diff --git a/compose/docker/cicd-codebuild/Dockerfile-CodeBuild-4.0 b/compose/docker/cicd-codebuild/Dockerfile-CodeBuild-4.0 index 37756fec..218d7222 100644 --- a/compose/docker/cicd-codebuild/Dockerfile-CodeBuild-4.0 +++ b/compose/docker/cicd-codebuild/Dockerfile-CodeBuild-4.0 @@ -50,7 +50,7 @@ ENV TERRASCAN_VERSION=1.18.0 ENV HELMFILE_VERSION=v0.144.0 ENV KUBECTL_VERSION=v1.26.1 ENV CHECKOV_VERSION=2.3.21 -ENV AWS_CLI_VERSION=2.10.0 +ENV AWS_CLI_VERSION=2.11.0 ENV VERIFY_CHECKSUM=false USER root diff --git a/compose/docker/cicd-codebuild/Dockerfile-CodeBuild-5.0 b/compose/docker/cicd-codebuild/Dockerfile-CodeBuild-5.0 index a929b519..ace762b3 100644 --- a/compose/docker/cicd-codebuild/Dockerfile-CodeBuild-5.0 +++ b/compose/docker/cicd-codebuild/Dockerfile-CodeBuild-5.0 @@ -50,7 +50,7 @@ ENV TERRASCAN_VERSION=1.18.0 ENV HELMFILE_VERSION=v0.145.0 ENV KUBECTL_VERSION=v1.26.1 ENV CHECKOV_VERSION=2.3.21 -ENV AWS_CLI_VERSION=2.10.0 +ENV AWS_CLI_VERSION=2.11.0 ENV VERIFY_CHECKSUM=false USER root diff --git a/compose/docker/cicd-codebuild/start-build.sh b/compose/docker/cicd-codebuild/start-build.sh index e61187eb..f09d0ee5 100755 --- a/compose/docker/cicd-codebuild/start-build.sh +++ b/compose/docker/cicd-codebuild/start-build.sh @@ -41,4 +41,9 @@ echo "docker images -a | grep none | awk '{ print $3; }' | xargs docker rmi" docker images -a | grep none | awk '{ print $3; }' | xargs docker rmi echo "" +echo "Cleanup Unknown Tags" +echo "docker images -a | grep none | awk '{ print $3; }' | xargs docker rmi" +docker images -a | grep none | awk '{ print $3; }' | xargs docker rmi +echo "" + echo "-- ALL DONE --" diff --git a/compose/docker/cicd-ubuntu/Dockerfile b/compose/docker/cicd-ubuntu/Dockerfile index 974a9d6f..30dbeed6 100644 --- a/compose/docker/cicd-ubuntu/Dockerfile +++ b/compose/docker/cicd-ubuntu/Dockerfile @@ -51,7 +51,7 @@ ENV TERRASCAN_VERSION=1.17.0 ENV HELMFILE_VERSION=0.144.0 ENV KUBECTL_VERSION=1.25.4 ENV CHECKOV_VERSION=2.1.244 -ENV AWS_CLI_VERSION=2.9.1 +ENV AWS_CLI_VERSION=2.11.0 ENV VERIFY_CHECKSUM=false USER root diff --git a/compose/docker/cicd-ubuntu/Dockerfile-Ubuntu-16.04 b/compose/docker/cicd-ubuntu/Dockerfile-Ubuntu-16.04 index 378357fb..1391e55b 100644 --- a/compose/docker/cicd-ubuntu/Dockerfile-Ubuntu-16.04 +++ b/compose/docker/cicd-ubuntu/Dockerfile-Ubuntu-16.04 @@ -51,7 +51,7 @@ ENV TERRASCAN_VERSION=1.17.0 ENV HELMFILE_VERSION=0.144.0 ENV KUBECTL_VERSION=1.25.4 ENV CHECKOV_VERSION=2.1.244 -ENV AWS_CLI_VERSION=2.9.1 +ENV AWS_CLI_VERSION=2.11.0 ENV VERIFY_CHECKSUM=false USER root diff --git a/compose/docker/cicd-ubuntu/Dockerfile-Ubuntu-18.04 b/compose/docker/cicd-ubuntu/Dockerfile-Ubuntu-18.04 index dd847c0e..10cc359a 100644 --- a/compose/docker/cicd-ubuntu/Dockerfile-Ubuntu-18.04 +++ b/compose/docker/cicd-ubuntu/Dockerfile-Ubuntu-18.04 @@ -51,7 +51,7 @@ ENV TERRASCAN_VERSION=1.17.0 ENV HELMFILE_VERSION=0.144.0 ENV KUBECTL_VERSION=1.25.4 ENV CHECKOV_VERSION=2.1.244 -ENV AWS_CLI_VERSION=2.9.1 +ENV AWS_CLI_VERSION=2.11.0 ENV VERIFY_CHECKSUM=false USER root diff --git a/compose/docker/cicd-ubuntu/Dockerfile-Ubuntu-20.04 b/compose/docker/cicd-ubuntu/Dockerfile-Ubuntu-20.04 index 358135d2..b5a74720 100644 --- a/compose/docker/cicd-ubuntu/Dockerfile-Ubuntu-20.04 +++ b/compose/docker/cicd-ubuntu/Dockerfile-Ubuntu-20.04 @@ -51,7 +51,7 @@ ENV TERRASCAN_VERSION=1.17.0 ENV HELMFILE_VERSION=0.144.0 ENV KUBECTL_VERSION=1.25.4 ENV CHECKOV_VERSION=2.1.244 -ENV AWS_CLI_VERSION=2.9.1 +ENV AWS_CLI_VERSION=2.11.0 ENV VERIFY_CHECKSUM=false USER root diff --git a/compose/docker/cicd-ubuntu/Dockerfile-Ubuntu-22.04 b/compose/docker/cicd-ubuntu/Dockerfile-Ubuntu-22.04 index 974a9d6f..30dbeed6 100644 --- a/compose/docker/cicd-ubuntu/Dockerfile-Ubuntu-22.04 +++ b/compose/docker/cicd-ubuntu/Dockerfile-Ubuntu-22.04 @@ -51,7 +51,7 @@ ENV TERRASCAN_VERSION=1.17.0 ENV HELMFILE_VERSION=0.144.0 ENV KUBECTL_VERSION=1.25.4 ENV CHECKOV_VERSION=2.1.244 -ENV AWS_CLI_VERSION=2.9.1 +ENV AWS_CLI_VERSION=2.11.0 ENV VERIFY_CHECKSUM=false USER root diff --git a/compose/docker/nifi-registry/Dockerfile b/compose/docker/nifi-registry/Dockerfile index f9bde824..1cae5cab 100644 --- a/compose/docker/nifi-registry/Dockerfile +++ b/compose/docker/nifi-registry/Dockerfile @@ -21,7 +21,7 @@ ENV NIFI_REGISTRY_BINARY=nifi-registry-1.18.0-bin.zip ENV NIFI_REGISTRY_BINARY_PATH=nifi/1.18.0/nifi-registry-1.18.0-bin.zip ENV NIFI_REGISTRY_BINARY_URL=https://downloads.apache.org/nifi/1.18.0/nifi-registry-1.18.0-bin.zip -ENV AWS_CLI_VERSION=2.9.1 +ENV AWS_CLI_VERSION=2.11.0 ENV VERIFY_CHECKSUM=false LABEL maintainer="$AUTHOR" \ diff --git a/compose/docker/nifi-registry/Dockerfile-1.16 b/compose/docker/nifi-registry/Dockerfile-1.16 index e7fdb5f1..109e287e 100644 --- a/compose/docker/nifi-registry/Dockerfile-1.16 +++ b/compose/docker/nifi-registry/Dockerfile-1.16 @@ -21,7 +21,7 @@ ENV NIFI_REGISTRY_BINARY=nifi-registry-1.16.3-bin.zip ENV NIFI_REGISTRY_BINARY_PATH=nifi/1.16.3/nifi-registry-1.16.3-bin.zip ENV NIFI_REGISTRY_BINARY_URL=https://downloads.apache.org/nifi/1.16.3/nifi-registry-1.16.3-bin.zip -ENV AWS_CLI_VERSION=2.9.1 +ENV AWS_CLI_VERSION=2.11.0 ENV VERIFY_CHECKSUM=false LABEL maintainer="$AUTHOR" \ diff --git a/compose/docker/nifi-registry/Dockerfile-1.17 b/compose/docker/nifi-registry/Dockerfile-1.17 index 9c39eb44..086074d5 100644 --- a/compose/docker/nifi-registry/Dockerfile-1.17 +++ b/compose/docker/nifi-registry/Dockerfile-1.17 @@ -21,7 +21,7 @@ ENV NIFI_REGISTRY_BINARY=nifi-registry-1.17.0-bin.zip ENV NIFI_REGISTRY_BINARY_PATH=nifi/1.17.0/nifi-registry-1.17.0-bin.zip ENV NIFI_REGISTRY_BINARY_URL=https://downloads.apache.org/nifi/1.17.0/nifi-registry-1.17.0-bin.zip -ENV AWS_CLI_VERSION=2.9.1 +ENV AWS_CLI_VERSION=2.11.0 ENV VERIFY_CHECKSUM=false LABEL maintainer="$AUTHOR" \ diff --git a/compose/docker/nifi-registry/Dockerfile-1.18 b/compose/docker/nifi-registry/Dockerfile-1.18 index f9bde824..1cae5cab 100644 --- a/compose/docker/nifi-registry/Dockerfile-1.18 +++ b/compose/docker/nifi-registry/Dockerfile-1.18 @@ -21,7 +21,7 @@ ENV NIFI_REGISTRY_BINARY=nifi-registry-1.18.0-bin.zip ENV NIFI_REGISTRY_BINARY_PATH=nifi/1.18.0/nifi-registry-1.18.0-bin.zip ENV NIFI_REGISTRY_BINARY_URL=https://downloads.apache.org/nifi/1.18.0/nifi-registry-1.18.0-bin.zip -ENV AWS_CLI_VERSION=2.9.1 +ENV AWS_CLI_VERSION=2.11.0 ENV VERIFY_CHECKSUM=false LABEL maintainer="$AUTHOR" \ diff --git a/compose/docker/nifi/Dockerfile b/compose/docker/nifi/Dockerfile index 5527979a..d950ae96 100644 --- a/compose/docker/nifi/Dockerfile +++ b/compose/docker/nifi/Dockerfile @@ -25,7 +25,7 @@ ENV NIFI_TOOLKIT_HOME=/opt/nifi/nifi-toolkit-current ENV NIFI_PID_DIR=/opt/nifi/nifi-current/run ENV NIFI_LOG_DIR=/opt/nifi/nifi-current/logs -ENV AWS_CLI_VERSION=2.9.1 +ENV AWS_CLI_VERSION=2.11.0 ENV VERIFY_CHECKSUM=false LABEL maintainer="$AUTHOR" \ diff --git a/compose/docker/nifi/Dockerfile-1.16 b/compose/docker/nifi/Dockerfile-1.16 index b237e3f6..f332e1ff 100644 --- a/compose/docker/nifi/Dockerfile-1.16 +++ b/compose/docker/nifi/Dockerfile-1.16 @@ -25,7 +25,7 @@ ENV NIFI_TOOLKIT_HOME=/opt/nifi/nifi-toolkit-current ENV NIFI_PID_DIR=/opt/nifi/nifi-current/run ENV NIFI_LOG_DIR=/opt/nifi/nifi-current/logs -ENV AWS_CLI_VERSION=2.9.1 +ENV AWS_CLI_VERSION=2.11.0 ENV VERIFY_CHECKSUM=false LABEL maintainer="$AUTHOR" \ diff --git a/compose/docker/nifi/Dockerfile-1.17 b/compose/docker/nifi/Dockerfile-1.17 index f843b4e7..18cc2924 100644 --- a/compose/docker/nifi/Dockerfile-1.17 +++ b/compose/docker/nifi/Dockerfile-1.17 @@ -25,7 +25,7 @@ ENV NIFI_TOOLKIT_HOME=/opt/nifi/nifi-toolkit-current ENV NIFI_PID_DIR=/opt/nifi/nifi-current/run ENV NIFI_LOG_DIR=/opt/nifi/nifi-current/logs -ENV AWS_CLI_VERSION=2.9.1 +ENV AWS_CLI_VERSION=2.11.0 ENV VERIFY_CHECKSUM=false LABEL maintainer="$AUTHOR" \ diff --git a/compose/docker/nifi/Dockerfile-1.18 b/compose/docker/nifi/Dockerfile-1.18 index 5527979a..d950ae96 100644 --- a/compose/docker/nifi/Dockerfile-1.18 +++ b/compose/docker/nifi/Dockerfile-1.18 @@ -25,7 +25,7 @@ ENV NIFI_TOOLKIT_HOME=/opt/nifi/nifi-toolkit-current ENV NIFI_PID_DIR=/opt/nifi/nifi-current/run ENV NIFI_LOG_DIR=/opt/nifi/nifi-current/logs -ENV AWS_CLI_VERSION=2.9.1 +ENV AWS_CLI_VERSION=2.11.0 ENV VERIFY_CHECKSUM=false LABEL maintainer="$AUTHOR" \ diff --git a/compose/ecr-build.sh b/compose/ecr-build.sh index feaa6c7a..9a069f4e 100755 --- a/compose/ecr-build.sh +++ b/compose/ecr-build.sh @@ -74,4 +74,4 @@ main() { main $1 $2 $3 $4 $5 $6 ### How to Execute ### -# ./ecr-build.sh [AWS_ACCOUNT] Dockerfile [ECR_PATH] [alpine|ubuntu|codebuild] [version|latest|tags] [custom-tags] +# ./ecr-build.sh [AWS_ACCOUNT] Dockerfile [ECR_PATH] [alpine|ubuntu|codebuild] [version|latest|tags] [custom-tags] \ No newline at end of file diff --git a/compose/ecr-pull.sh b/compose/ecr-pull.sh index 606e712f..e61f8163 100755 --- a/compose/ecr-pull.sh +++ b/compose/ecr-pull.sh @@ -52,4 +52,4 @@ main() { main $1 $2 $3 ### How to Execute ### -# ./ecr-pull.sh [AWS_ACCOUNT] [ECR_PATH] [alpine|ubuntu|codebuild|version|latest|tags|custom-tags] +# ./ecr-pull.sh [AWS_ACCOUNT] [ECR_PATH] [alpine|ubuntu|codebuild|version|latest|tags|custom-tags] \ No newline at end of file diff --git a/compose/ecr-push.sh b/compose/ecr-push.sh index f5627aab..fcc9fe2b 100755 --- a/compose/ecr-push.sh +++ b/compose/ecr-push.sh @@ -48,4 +48,4 @@ main() { main $1 $2 $3 ### How to Execute ### -# ./ecr-push.sh [AWS_ACCOUNT] [ECR_PATH] [alpine|ubuntu|codebuild|version|latest|tags|custom-tags] +# ./ecr-push.sh [AWS_ACCOUNT] [ECR_PATH] [alpine|ubuntu|codebuild|version|latest|tags|custom-tags] \ No newline at end of file diff --git a/compose/ecr-tag.sh b/compose/ecr-tag.sh index 7842fabd..ae4cb27a 100755 --- a/compose/ecr-tag.sh +++ b/compose/ecr-tag.sh @@ -56,4 +56,4 @@ main() { main $1 $2 $3 $4 $5 ### How to Execute ### -# ./ecr-tag.sh [AWS_ACCOUNT] [ECR_PATH] [alpine|ubuntu|codebuild] [version|latest|tags] [custom-tags] +# ./ecr-tag.sh [AWS_ACCOUNT] [ECR_PATH] [alpine|ubuntu|codebuild] [version|latest|tags] [custom-tags] \ No newline at end of file diff --git a/docs/README-AWS-Cli.md b/docs/README-AWS-Cli.md index 6bfb8e1a..0ebe989c 100644 --- a/docs/README-AWS-Cli.md +++ b/docs/README-AWS-Cli.md @@ -24,19 +24,32 @@ DevOps Corner Indonesia - AWS Cli v2 Container Image (`Alpine 3.17` & `Python 3. |------------|------| | `devopscorner/aws-cli:latest` | [![docker image size](https://img.shields.io/docker/image-size/devopscorner/aws-cli/latest.svg?label=Image%20size&logo=docker)](https://hub.docker.com/repository/docker/devopscorner/aws-cli/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/aws-cli:alpine-3.17` | [![docker image size](https://img.shields.io/docker/image-size/devopscorner/aws-cli/alpine-3.17.svg?label=Image%20size&logo=docker)](https://hub.docker.com/repository/docker/devopscorner/aws-cli/tags?page=1&ordering=last_updated&name=alpine-3.17) | +| `devopscorner/aws-cli:alpine3.17-2.11.0` | [![docker image size](https://img.shields.io/docker/image-size/devopscorner/aws-cli/alpine3.17-2.11.0.svg?label=Image%20size&logo=docker)](https://hub.docker.com/repository/docker/devopscorner/aws-cli/tags?page=1&ordering=last_updated&name=alpine3.17-2.11.0) | +| `devopscorner/aws-cli:alpine3.17-python3.10.10-2.11.0` | [![docker image size](https://img.shields.io/docker/image-size/devopscorner/aws-cli/alpine3.17-2.11.0.svg?label=Image%20size&logo=docker)](https://hub.docker.com/repository/docker/devopscorner/aws-cli/tags?page=1&ordering=last_updated&name=alpine3.17-2.11.0) | +| `devopscorner/aws-cli:2.11.0` | [![docker image size](https://img.shields.io/docker/image-size/devopscorner/aws-cli/2.11.0.svg?label=Image%20size&logo=docker)](https://hub.docker.com/repository/docker/devopscorner/aws-cli/tags?page=1&ordering=last_updated&name=2.11.0) | +| `devopscorner/aws-cli:python3.10.10` | [![docker image size](https://img.shields.io/docker/image-size/devopscorner/aws-cli/python3.10.10.svg?label=Image%20size&logo=docker)](https://hub.docker.com/repository/docker/devopscorner/aws-cli/tags?page=1&ordering=last_updated&name=python3.10.10) | +| `devopscorner/aws-cli:python3.10.10-2.11.0` | [![docker image size](https://img.shields.io/docker/image-size/devopscorner/aws-cli/python3.10.10-2.11.0.svg?label=Image%20size&logo=docker)](https://hub.docker.com/repository/docker/devopscorner/aws-cli/tags?page=1&ordering=last_updated&name=python3.10.10-2.11.0) | + + +### Alpine 3.17 (Depreciated) + +| Image name | Size | +|------------|------| | `devopscorner/aws-cli:alpine3.17-2.10.0` | [![docker image size](https://img.shields.io/docker/image-size/devopscorner/aws-cli/alpine3.17-2.10.0.svg?label=Image%20size&logo=docker)](https://hub.docker.com/repository/docker/devopscorner/aws-cli/tags?page=1&ordering=last_updated&name=alpine3.17-2.10.0) | | `devopscorner/aws-cli:alpine3.17-python3.10.10-2.10.0` | [![docker image size](https://img.shields.io/docker/image-size/devopscorner/aws-cli/alpine3.17-2.10.0.svg?label=Image%20size&logo=docker)](https://hub.docker.com/repository/docker/devopscorner/aws-cli/tags?page=1&ordering=last_updated&name=alpine3.17-2.10.0) | | `devopscorner/aws-cli:2.10.0` | [![docker image size](https://img.shields.io/docker/image-size/devopscorner/aws-cli/2.10.0.svg?label=Image%20size&logo=docker)](https://hub.docker.com/repository/docker/devopscorner/aws-cli/tags?page=1&ordering=last_updated&name=2.10.0) | | `devopscorner/aws-cli:python3.10.10` | [![docker image size](https://img.shields.io/docker/image-size/devopscorner/aws-cli/python3.10.10.svg?label=Image%20size&logo=docker)](https://hub.docker.com/repository/docker/devopscorner/aws-cli/tags?page=1&ordering=last_updated&name=python3.10.10) | | `devopscorner/aws-cli:python3.10.10-2.10.0` | [![docker image size](https://img.shields.io/docker/image-size/devopscorner/aws-cli/python3.10.10-2.10.0.svg?label=Image%20size&logo=docker)](https://hub.docker.com/repository/docker/devopscorner/aws-cli/tags?page=1&ordering=last_updated&name=python3.10.10-2.10.0) | + ### Alpine 3.16 | Image name | Size | |------------|------| | `devopscorner/aws-cli:alpine-3.16` | [![docker image size](https://img.shields.io/docker/image-size/devopscorner/aws-cli/alpine-3.16.svg?label=Image%20size&logo=docker)](https://hub.docker.com/repository/docker/devopscorner/aws-cli/tags?page=1&ordering=last_updated&name=alpine-3.16) | -| `devopscorner/aws-cli:alpine3.16-2.10.0` | [![docker image size](https://img.shields.io/docker/image-size/devopscorner/aws-cli/alpine3.16-2.10.0.svg?label=Image%20size&logo=docker)](https://hub.docker.com/repository/docker/devopscorner/aws-cli/tags?page=1&ordering=last_updated&name=alpine3.16-2.10.0) | -| `devopscorner/aws-cli:alpine3.16-python3.10.10-2.10.0` | [![docker image size](https://img.shields.io/docker/image-size/devopscorner/aws-cli/alpine3.16-2.10.0.svg?label=Image%20size&logo=docker)](https://hub.docker.com/repository/docker/devopscorner/aws-cli/tags?page=1&ordering=last_updated&name=alpine3.16-2.10.0) | +| `devopscorner/aws-cli:alpine3.16-2.11.0` | [![docker image size](https://img.shields.io/docker/image-size/devopscorner/aws-cli/alpine3.16-2.11.0.svg?label=Image%20size&logo=docker)](https://hub.docker.com/repository/docker/devopscorner/aws-cli/tags?page=1&ordering=last_updated&name=alpine3.16-2.11.0) | +| `devopscorner/aws-cli:alpine3.16-python3.10.10-2.11.0` | [![docker image size](https://img.shields.io/docker/image-size/devopscorner/aws-cli/alpine3.16-2.11.0.svg?label=Image%20size&logo=docker)](https://hub.docker.com/repository/docker/devopscorner/aws-cli/tags?page=1&ordering=last_updated&name=alpine3.16-2.11.0) | + ### Alpine 3.16 (Depreciated) @@ -45,6 +58,8 @@ DevOps Corner Indonesia - AWS Cli v2 Container Image (`Alpine 3.17` & `Python 3. | `devopscorner/aws-cli:2.9.1` | [![docker image size](https://img.shields.io/docker/image-size/devopscorner/aws-cli/2.9.1.svg?label=Image%20size&logo=docker)](https://hub.docker.com/repository/docker/devopscorner/aws-cli/tags?page=1&ordering=last_updated&name=2.9.1) | | `devopscorner/aws-cli:python3.10.8-2.9.1` | [![docker image size](https://img.shields.io/docker/image-size/devopscorner/aws-cli/python3.10.8-2.9.1.svg?label=Image%20size&logo=docker)](https://hub.docker.com/repository/docker/devopscorner/aws-cli/tags?page=1&ordering=last_updated&name=python3.10.8-2.9.1) | | `devopscorner/aws-cli:alpine3.16-python3.10.8-2.9.1` | [![docker image size](https://img.shields.io/docker/image-size/devopscorner/aws-cli/alpine3.16-python3.10.8-2.9.1.svg?label=Image%20size&logo=docker)](https://hub.docker.com/repository/docker/devopscorner/aws-cli/tags?page=1&ordering=last_updated&name=alpine3.16-python3.10.8-2.9.1) | +| `devopscorner/aws-cli:alpine3.16-2.10.0` | [![docker image size](https://img.shields.io/docker/image-size/devopscorner/aws-cli/alpine3.16-2.10.0.svg?label=Image%20size&logo=docker)](https://hub.docker.com/repository/docker/devopscorner/aws-cli/tags?page=1&ordering=last_updated&name=alpine3.16-2.10.0) | +| `devopscorner/aws-cli:alpine3.16-python3.10.10-2.10.0` | [![docker image size](https://img.shields.io/docker/image-size/devopscorner/aws-cli/alpine3.16-2.10.0.svg?label=Image%20size&logo=docker)](https://hub.docker.com/repository/docker/devopscorner/aws-cli/tags?page=1&ordering=last_updated&name=alpine3.16-2.10.0) | --- @@ -85,7 +100,7 @@ PS C:\> $Env:AWS_DEFAULT_REGION="ap-southeast-1" ```docker ARG ALPINE_VERSION=3.17 -ARG AWS_CLI_VERSION=2.10.0 +ARG AWS_CLI_VERSION=2.11.0 ENV CICD_VERSION="1.23" ``` @@ -101,7 +116,7 @@ ARG ALPINE_VERSION=3.17 ### Builder ### FROM python:3.10.10-alpine${ALPINE_VERSION} as builder -ARG AWS_CLI_VERSION=2.10.0 +ARG AWS_CLI_VERSION=2.11.0 RUN apk add --no-cache git unzip groff build-base libffi-dev cmake RUN git clone --single-branch --depth 1 -b ${AWS_CLI_VERSION} https://github.com/aws/aws-cli.git diff --git a/docs/README-Airflow.md b/docs/README-Airflow.md index c649c1d5..e4461e65 100644 --- a/docs/README-Airflow.md +++ b/docs/README-Airflow.md @@ -66,7 +66,7 @@ PS C:\> $Env:AWS_DEFAULT_REGION="ap-southeast-3" ## Environment ```docker -ENV AWS_CLI_VERSION=2.9.1 +ENV AWS_CLI_VERSION=2.11.0 ENV AIRFLOW_VERSION=2.5.0 ENV VERIFY_CHECKSUM=false @@ -105,7 +105,7 @@ ENV IMG_VERSION="2.5.0" ENV IMG_DESC="Docker Image Airflow 2.5.0 with Python-3.10" ENV IMG_ARCH="amd64/x86_64" -ENV AWS_CLI_VERSION=2.9.1 +ENV AWS_CLI_VERSION=2.11.0 ENV AIRFLOW_VERSION=2.5.0 ENV VERIFY_CHECKSUM=false From 0c68e4c34a8b8c2e404a466acec00c0cce77cef7 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Tue, 7 Mar 2023 08:54:21 +0000 Subject: [PATCH 19/19] Automated clone.json update --- clone.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/clone.json b/clone.json index 75854eb1..9369c602 100644 --- a/clone.json +++ b/clone.json @@ -1,5 +1,5 @@ { - "count": 326, + "count": 331, "uniques": 65, "clones": [ { @@ -74,8 +74,8 @@ }, { "timestamp": "2023-03-07T00:00:00Z", - "count": 5, - "uniques": 3 + "count": 10, + "uniques": 5 } ] }