Skip to content

Commit

Permalink
Update base images. Prep v12.2 release. (#445)
Browse files Browse the repository at this point in the history
* Update base images

* prep v12.2
  • Loading branch information
sudermanjr authored Aug 10, 2023
1 parent 5ff460b commit 342a165
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions ci-images/alpine/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/ci-images.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion examples/ci/bitbucket-pipelines.yml
Original file line number Diff line number Diff line change
@@ -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 |
Expand Down
2 changes: 1 addition & 1 deletion examples/minimal-sops-secrets/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/minimal/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion orb/executors/ci-images.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
parameters:
version:
type: string
default: "v12.1-buster"
default: "v12.2-buster"
docker:
- image: quay.io/reactiveops/ci-images:<<parameters.version>>
2 changes: 1 addition & 1 deletion orb/executors/default.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
parameters:
version:
type: string
default: "v12.1-buster"
default: "v12.2-buster"
docker:
- image: quay.io/reactiveops/ci-images:<<parameters.version>>
2 changes: 1 addition & 1 deletion orb/jobs/kubernetes_e2e_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 342a165

Please sign in to comment.