From 342a16595c99b1f3f8950ae7ac3ab45a40a6214d Mon Sep 17 00:00:00 2001 From: Andrew Suderman Date: Thu, 10 Aug 2023 08:54:52 -0600 Subject: [PATCH] Update base images. Prep v12.2 release. (#445) * Update base images * prep v12.2 --- ci-images/alpine/Dockerfile | 6 +++--- docs/ci-images.md | 2 +- examples/ci/bitbucket-pipelines.yml | 2 +- examples/minimal-sops-secrets/README.md | 2 +- examples/minimal/README.md | 2 +- orb/executors/ci-images.yml | 2 +- orb/executors/default.yml | 2 +- orb/jobs/kubernetes_e2e_tests.yml | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ci-images/alpine/Dockerfile b/ci-images/alpine/Dockerfile index 50e13d5c..629aaf8c 100644 --- a/ci-images/alpine/Dockerfile +++ b/ci-images/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10-alpine3.17 as builder +FROM python:3.10-alpine3.18 as builder ARG AWS_CLI_VERSION=2.11.15 RUN apk add --no-cache git unzip groff build-base libffi-dev cmake @@ -19,11 +19,11 @@ RUN find /usr/local/lib/aws-cli/awscli/botocore/data -name examples-1.json -dele RUN (cd /usr/local/lib/aws-cli; for a in *.so*; do test -f /lib/$a && rm $a; done) -FROM docker:20.10.7 +FROM docker:24.0.5 USER root -RUN apk add --update --no-cache jq wget py-pip curl bash git openssh-client +RUN apk add --update --no-cache jq wget py-pip curl bash git openssh-client RUN ln -s /usr/local/lib/aws-cli/aws /usr/local/bin/aws COPY --from=builder /usr/local/lib/aws-cli/ /usr/local/lib/aws-cli/ COPY bin /usr/local/bin diff --git a/docs/ci-images.md b/docs/ci-images.md index cec20899..d9e8c244 100644 --- a/docs/ci-images.md +++ b/docs/ci-images.md @@ -7,7 +7,7 @@ meta: Each new release of rok8s-scripts generates CI images for common workflows. These images include a set of common CI/CD dependencies, including Docker, Kubernetes, Helm, AWS, and Google Cloud client libraries. Starting with these images as a base for deployment workflows ensures that you don't need to spend any build time installing extra dependencies. -We currently include CI Images based on Alpine and Debian Buster as our recommended starting points. The latest Debian Buster release can be pulled from `quay.io/reactiveops/ci-images:v12.1-buster`. A full list of image tags is available on our [Quay repository](https://quay.io/repository/reactiveops/ci-images). +We currently include CI Images based on Alpine and Debian Buster as our recommended starting points. The latest Debian Buster release can be pulled from `quay.io/reactiveops/ci-images:v12.2-buster`. A full list of image tags is available on our [Quay repository](https://quay.io/repository/reactiveops/ci-images). **Deprecation Notice** As of v10 and onward, alpine and stretch will be the only available images. diff --git a/examples/ci/bitbucket-pipelines.yml b/examples/ci/bitbucket-pipelines.yml index b4d68128..2697b249 100644 --- a/examples/ci/bitbucket-pipelines.yml +++ b/examples/ci/bitbucket-pipelines.yml @@ -1,4 +1,4 @@ -image: quay.io/reactiveops/ci-images:v12.1-buster +image: quay.io/reactiveops/ci-images:v12.2-buster aliases: - &initialize-env | diff --git a/examples/minimal-sops-secrets/README.md b/examples/minimal-sops-secrets/README.md index a9821c3a..a6203443 100644 --- a/examples/minimal-sops-secrets/README.md +++ b/examples/minimal-sops-secrets/README.md @@ -19,7 +19,7 @@ we run some of the scripts provided by rok8s-scripts. In particular, we use: * `k8s-deploy-and-verify` to deploy our image to Kubernetes and make sure the deployment succeeded * This also calls the `k8s-deploy-secrets` script to decrypt and deploy secrets -We also use the rok8s-scripts CI image, `quay.io/reactiveops/ci-images:v12.1-buster`, +We also use the rok8s-scripts CI image, `quay.io/reactiveops/ci-images:v12.2-buster`, to ensure rok8s-scripts and its dependencies are available during the build and deploy jobs. ## Try it out diff --git a/examples/minimal/README.md b/examples/minimal/README.md index 221392ee..a1f6705e 100644 --- a/examples/minimal/README.md +++ b/examples/minimal/README.md @@ -18,7 +18,7 @@ we run some of the scripts provided by rok8s-scripts. In particular, we use: * `prepare-kubectl` to configure the `kubectl` command to be able to deploy resources to our Kubernetes cluster * `k8s-deploy-and-verify` to deploy our image to Kubernetes and make sure the deployment succeeded -We also use the rok8s-scripts CI image, `quay.io/reactiveops/ci-images:v12.1-buster`, +We also use the rok8s-scripts CI image, `quay.io/reactiveops/ci-images:v12.2-buster`, to ensure rok8s-scripts and its dependencies are available during the build and deploy jobs. ## Try it out diff --git a/orb/executors/ci-images.yml b/orb/executors/ci-images.yml index 6b653dad..cf0c7f08 100644 --- a/orb/executors/ci-images.yml +++ b/orb/executors/ci-images.yml @@ -1,6 +1,6 @@ parameters: version: type: string - default: "v12.1-buster" + default: "v12.2-buster" docker: - image: quay.io/reactiveops/ci-images:<> diff --git a/orb/executors/default.yml b/orb/executors/default.yml index 6b653dad..cf0c7f08 100644 --- a/orb/executors/default.yml +++ b/orb/executors/default.yml @@ -1,6 +1,6 @@ parameters: version: type: string - default: "v12.1-buster" + default: "v12.2-buster" docker: - image: quay.io/reactiveops/ci-images:<> diff --git a/orb/jobs/kubernetes_e2e_tests.yml b/orb/jobs/kubernetes_e2e_tests.yml index 9d2bc30c..b1b35441 100644 --- a/orb/jobs/kubernetes_e2e_tests.yml +++ b/orb/jobs/kubernetes_e2e_tests.yml @@ -50,7 +50,7 @@ parameters: command_runner_image: description: "The image to execute commands from against the kind cluster. Also where the script gets executed." type: string - default: "quay.io/reactiveops/ci-images:v12.1-alpine" + default: "quay.io/reactiveops/ci-images:v12.2-alpine" pre_script: description: "Script to run on the local machine before running script on command runner." type: string