Skip to content

Commit

Permalink
Publish v1.23.0. [release] (#300)
Browse files Browse the repository at this point in the history
* Publish v1.23.0. [release]

* Break-glass publish via machine job with updated QEMU platform

---------

Co-authored-by: Bryan Johnson <[email protected]>
  • Loading branch information
cpe-image-bot and bjohnso5 authored Sep 9, 2024
1 parent 16862e4 commit a9f2ba0
Show file tree
Hide file tree
Showing 6 changed files with 177 additions and 42 deletions.
86 changes: 51 additions & 35 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,41 +23,57 @@ workflows:
when:
not: << pipeline.parameters.cron >>
jobs:
- cimg/build-and-deploy:
name: "Test"
resource-class: xlarge
docker-namespace: ccitest
docker-repository: go
filters:
branches:
ignore:
- main
context:
- slack-notification-access-token
- slack-cimg-notifications
- cimg-docker-image-building
post-steps:
- slack/notify:
branch_pattern: main
event: fail
mentions: "@images"
template: basic_fail_1
- cimg/build-and-deploy:
name: "Deploy"
resource-class: xlarge
docker-repository: go
filters:
branches:
only:
- main
- build_and_deploy:
context:
- slack-notification-access-token
- slack-cimg-notifications
- cimg-docker-image-building
- cimg-docker-image-publishing
post-steps:
- slack/notify:
branch_pattern: main
event: fail
mentions: "@images"
template: basic_fail_1
# - cimg/build-and-deploy:
# name: "Test"
# resource-class: xlarge
# docker-namespace: ccitest
# docker-repository: go
# filters:
# branches:
# ignore:
# - main
# context:
# - slack-notification-access-token
# - slack-cimg-notifications
# - cimg-docker-image-building
# post-steps:
# - slack/notify:
# branch_pattern: main
# event: fail
# mentions: "@images"
# template: basic_fail_1
# - cimg/build-and-deploy:
# name: "Deploy"
# resource-class: xlarge
# docker-repository: go
# filters:
# branches:
# only:
# - main
# context:
# - slack-notification-access-token
# - slack-cimg-notifications
# - cimg-docker-image-building
# - cimg-docker-image-publishing
# post-steps:
# - slack/notify:
# branch_pattern: main
# event: fail
# mentions: "@images"
# template: basic_fail_1

jobs:
build_and_deploy:
machine:
image: ubuntu-2404:current
resource_class: xlarge
steps:
- run: sudo apt-get install qemu-system
- run: docker run --privileged --rm tonistiigi/binfmt --install all
- checkout
- run: echo "$DOCKER_TOKEN" | docker login -u "$DOCKER_USER" --password-stdin
- run: ./build-images.sh
38 changes: 38 additions & 0 deletions 1.23/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# vim:set ft=dockerfile:

# Do not edit individual Dockerfiles manually. Instead, please make changes to the Dockerfile.template, which will be used by the build script to generate Dockerfiles.

# By policy, the base image tag should be a quarterly tag unless there's a
# specific reason to use a different one. This means January, April, July, or
# October.
FROM cimg/base:2024.07

LABEL maintainer="CircleCI Execution Team <[email protected]>"

ENV GO_VER="1.23.0"

# Install packages needed for CGO
RUN sudo apt-get update && sudo apt-get install -y --no-install-recommends \
g++ \
libc6-dev && \
sudo rm -rf /var/lib/apt/lists/* && \
[[ $(uname -m) == "x86_64" ]] && ARCH="amd64" || ARCH="arm64" && \
curl -sSL "https://go.dev/dl/go${GO_VER}.linux-${ARCH}.tar.gz" | sudo tar -xz -C /usr/local/ && \
mkdir -p /home/circleci/go/bin

ENV GOPATH="/home/circleci/go"
ENV PATH="$GOPATH/bin:/usr/local/go/bin:$PATH"

# Install related tools
# renovate: datasource=github-releases depName=gotestyourself/gotestsum
ENV GOTESTSUM_VERSION=1.12.0
# renovate: datasource=github-releases depName=golangci/golangci-lint
ENV GOCI_LINT_VERSION=1.60.1
# renovate: datasource=github-releases depName=golang/vuln
ENV GOVULNCHECK_VERSION=1.1.3

RUN [[ $(uname -m) == "x86_64" ]] && ARCH="amd64" || ARCH="arm64" && \
curl -sSL "https://github.com/gotestyourself/gotestsum/releases/download/v${GOTESTSUM_VERSION}/gotestsum_${GOTESTSUM_VERSION}_linux_${ARCH}.tar.gz" | \
sudo tar -xz -C /usr/local/bin gotestsum && \
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sudo sh -s -- -b /usr/local/bin v${GOCI_LINT_VERSION} && \
go install "golang.org/x/vuln/cmd/govulncheck@v${GOVULNCHECK_VERSION}" && go clean -cache -modcache && rm -rf "${GOPATH}/pkg"
63 changes: 63 additions & 0 deletions 1.23/browsers/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
# vim:set ft=dockerfile:

FROM cimg/go:1.23.0-node

LABEL maintainer="CircleCI Community & Partner Engineering Team <[email protected]>"

# Install Selenium
ENV SELENIUM_VER=3.141.59
RUN curl -sSL -o selenium-server-standalone-${SELENIUM_VER}.jar "https://selenium-release.storage.googleapis.com/${SELENIUM_VER%.*}/selenium-server-standalone-${SELENIUM_VER}.jar" && \
sudo cp selenium-server-standalone-${SELENIUM_VER}.jar /usr/local/bin/selenium.jar && \
rm selenium-server-standalone-${SELENIUM_VER}.jar

RUN sudo apt-get update && \
sudo apt-get install --yes --no-install-recommends \
xvfb \
&& \

# Install Java only if it's not already available
# Java is installed for Selenium
if ! command -v java > /dev/null; then \
echo "Java not found in parent image, installing..." && \
sudo apt-get install -y --no-install-recommends --no-upgrade openjdk-11-jre; \
fi && \
sudo rm -rf /var/lib/apt/lists/*

# Below is setup to allow xvfb to start when the container starts up.
# The label in particular allows this image to override what CircleCI does
# when booting the image.
LABEL com.circleci.preserve-entrypoint=true
ENV DISPLAY=":99"
#RUN printf '#!/bin/sh\nXvfb :99 -screen 0 1280x1024x24 &\nexec "$@"\n' > /tmp/entrypoint && \
# chmod +x /tmp/entrypoint && \
# sudo mv /tmp/entrypoint /docker-entrypoint.sh
RUN printf '#!/bin/sh\nXvfb :99 -screen 0 1280x1024x24 &\nexec "$@"\n' | sudo tee /docker-entrypoint.sh && \
sudo chmod +x /docker-entrypoint.sh

# Install a single version of Firefox. This isn't intended to be a regularly
# updated thing. Instead, if this version of Firefox isn't what the end user
# wants they should install a different version via the Browser Tools Orb.
#
# Canonical made a major technology change in how Firefox is installed from
# Ubuntu 21.10 and up. The general CI space doesn't seem to be ready for a snap
# based Firefox right now so we are installing it from the Mozilla PPA.
RUN echo 'Package: *' | sudo tee -a /etc/apt/preferences.d/firefox.pref && \
echo 'Pin: release o=LP-PPA-mozillateam' | sudo tee -a /etc/apt/preferences.d/firefox.pref && \
echo 'Pin-Priority: 1001' | sudo tee -a /etc/apt/preferences.d/firefox.pref && \
sudo add-apt-repository --yes ppa:mozillateam/ppa && \
sudo apt-get install --no-install-recommends --yes firefox && \
sudo rm -rf /var/lib/apt/lists/* && \
firefox --version

# Install a single version of Google Chrome Stable. This isn't intended to be a
# regularly updated thing. Instead, if this version of Chrome isn't what the
# end user wants they should install a different version via the Browser Tools
# Orb.
RUN wget -q -O - "https://dl.google.com/linux/linux_signing_key.pub" | sudo apt-key add - && \
echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" | sudo tee /etc/apt/sources.list.d/google-chrome.list && \
sudo apt-get update && \
sudo apt-get install google-chrome-stable && \
sudo rm -rf /var/lib/apt/lists/*

ENTRYPOINT ["/docker-entrypoint.sh"]
CMD ["/bin/sh"]
21 changes: 21 additions & 0 deletions 1.23/node/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# vim:set ft=dockerfile:

FROM cimg/go:1.23.0

LABEL maintainer="Community & Partner Engineering Team <[email protected]>"

# Dockerfile will pull the latest LTS release from cimg-node.
RUN curl -sSL "https://raw.githubusercontent.com/CircleCI-Public/cimg-node/main/ALIASES" -o nodeAliases.txt && \
NODE_VERSION=$(grep "lts" ./nodeAliases.txt | cut -d "=" -f 2-) && \
[[ $(uname -m) == "x86_64" ]] && ARCH="x64" || ARCH="arm64" && \
curl -L -o node.tar.xz "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-${ARCH}.tar.xz" && \
sudo tar -xJf node.tar.xz -C /usr/local --strip-components=1 && \
rm node.tar.xz nodeAliases.txt && \
sudo ln -s /usr/local/bin/node /usr/local/bin/nodejs

ENV YARN_VERSION 1.22.19
RUN curl -L -o yarn.tar.gz "https://yarnpkg.com/downloads/${YARN_VERSION}/yarn-v${YARN_VERSION}.tar.gz" && \
sudo tar -xzf yarn.tar.gz -C /opt/ && \
rm yarn.tar.gz && \
sudo ln -s /opt/yarn-v${YARN_VERSION}/bin/yarn /usr/local/bin/yarn && \
sudo ln -s /opt/yarn-v${YARN_VERSION}/bin/yarnpkg /usr/local/bin/yarnpkg
2 changes: 1 addition & 1 deletion GEN-CHECK
Original file line number Diff line number Diff line change
@@ -1 +1 @@
GEN_CHECK=(1.22.6 1.21.13)
GEN_CHECK=(1.23.0)
9 changes: 3 additions & 6 deletions build-images.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ set -eo pipefail

docker context create cimg
docker buildx create --use cimg
docker buildx build --platform=linux/amd64,linux/arm64 --file 1.22/Dockerfile -t cimg/go:1.22.6 -t cimg/go:1.22 --push .
docker buildx build --platform=linux/amd64,linux/arm64 --file 1.22/node/Dockerfile -t cimg/go:1.22.6-node -t cimg/go:1.22-node --push .
docker buildx build --platform=linux/amd64 --file 1.22/browsers/Dockerfile -t cimg/go:1.22.6-browsers -t cimg/go:1.22-browsers --push .
docker buildx build --platform=linux/amd64,linux/arm64 --file 1.21/Dockerfile -t cimg/go:1.21.13 -t cimg/go:1.21 --push .
docker buildx build --platform=linux/amd64,linux/arm64 --file 1.21/node/Dockerfile -t cimg/go:1.21.13-node -t cimg/go:1.21-node --push .
docker buildx build --platform=linux/amd64 --file 1.21/browsers/Dockerfile -t cimg/go:1.21.13-browsers -t cimg/go:1.21-browsers --push .
docker buildx build --platform=linux/amd64,linux/arm64 --file 1.23/Dockerfile -t cimg/go:1.23.0 -t cimg/go:1.23 --push .
docker buildx build --platform=linux/amd64,linux/arm64 --file 1.23/node/Dockerfile -t cimg/go:1.23.0-node -t cimg/go:1.23-node --push .
docker buildx build --platform=linux/amd64 --file 1.23/browsers/Dockerfile -t cimg/go:1.23.0-browsers -t cimg/go:1.23-browsers --push .

0 comments on commit a9f2ba0

Please sign in to comment.