diff --git a/Dockerfile.alpine b/Dockerfile.alpine index 7e4c5bd..e163a25 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -1,4 +1,4 @@ -FROM twdps/circleci-remote-docker:alpine-2024.08.2 +FROM twdps/circleci-remote-docker:alpine-2024.10 LABEL org.opencontainers.image.title="circleci-base-image" \ org.opencontainers.image.description="Alpine-based CircleCI executor image" \ @@ -12,8 +12,8 @@ LABEL org.opencontainers.image.title="circleci-base-image" \ org.opencontainers.image.version="VERSION" ENV ONEPASSWORD_VERSION=2.30.0 -ENV VAULT_VERSION=1.17.5 -ENV BUILDEVENTS_VERSION=0.16.0 +ENV VAULT_VERSION=1.17.6 +ENV BUILDEVENTS_VERSION=0.17.0 # ENV TELLER_VERSION=2.0.7 # hadolint ignore=DL3044 @@ -26,7 +26,7 @@ ENV MUSL_LOCPATH=/usr/share/i18n/locales/musl \ RUN apk add --no-cache \ sudo==1.9.15_p5-r0 \ github-cli=2.47.0-r4 \ - tzdata=2024a-r1 \ + tzdata=2024b-r0 \ gettext-dev=0.22.5-r0 \ libintl=0.22.5-r0 \ build-base=0.5-r3 \ @@ -37,10 +37,10 @@ RUN apk add --no-cache \ g++=13.2.1_git20240309-r0 \ cmake=3.29.3-r0 \ make=4.4.1-r2 \ - curl=8.9.1-r1 \ - libcurl=8.9.1-r1 \ - curl-dev=8.9.1-r1 \ - openssl-dev=3.3.1-r3 \ + curl=8.10.1-r0 \ + libcurl=8.10.1-r0 \ + curl-dev=8.10.1-r0 \ + openssl-dev=3.3.2-r1 \ wget=1.24.5-r0 \ unzip=6.0-r14 \ zip=3.0-r12 \ diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index 3d8ffff..067c85c 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -1,4 +1,4 @@ -FROM twdps/circleci-remote-docker:ubuntu-2024.08.2 +FROM twdps/circleci-remote-docker:ubuntu-2024.10 LABEL org.opencontainers.image.title="circleci-base-image" \ org.opencontainers.image.description="Ubuntu-based CircleCI executor image" \ @@ -11,14 +11,13 @@ LABEL org.opencontainers.image.title="circleci-base-image" \ org.opencontainers.image.created="CREATED" \ org.opencontainers.image.version="VERSION" -ENV DOCKER_VERSION=5:27.2.0-1~ubuntu.24.04~noble -ENV DOCKER_BUILDX_VERSION=0.16.2-1~ubuntu.24.04~noble -ENV DOCKER_COMPOSE_VERSION=2.29.2-1~ubuntu.24.04~noble +ENV DOCKER_VERSION=5:27.3.1-1~ubuntu.24.04~noble +ENV CONTAINERD_VERSION=1.7.22-1 +ENV DOCKER_BUILDX_VERSION=0.17.1-1~ubuntu.24.04~noble ENV ONEPASSWORD_VERSION=2.30.0 -ENV VAULT_VERSION=1.17.3 -ENV BUILDEVENTS_VERSION=0.16.0 +ENV VAULT_VERSION=1.17.6 +ENV BUILDEVENTS_VERSION=0.17.0 ENV DEBIAN_FRONTEND=noninteractive -# ENV TELLER_VERSION=2.0.7 ENV PATH=/home/circleci/bin:/home/circleci/.local/bin:$PATH \ LANG=en_US.UTF-8 \ @@ -32,20 +31,20 @@ RUN echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/90forceyes && \ echo 'DPkg::Options "--force-confnew";' >> /etc/apt/apt.conf.d/90forceyes && \ apt update && apt-get install --no-install-recommends -y \ sudo=1.9.15p5-3ubuntu5 \ - locales=2.40-1ubuntu1 \ + locales=2.40-1ubuntu3 \ tzdata=2024a-4ubuntu1 \ - libcurl4-openssl-dev=8.9.1-2ubuntu1 \ + libcurl4-openssl-dev=8.9.1-2ubuntu2 \ apt-transport-https=2.9.8 \ lsb-release=12.1-1 \ gettext-base=0.22.5-2 \ build-essential=12.10ubuntu1 \ gcc=4:14.1.0-2ubuntu1 \ g++=4:14.1.0-2ubuntu1 \ - cmake=3.30.2-2 \ + cmake=3.30.3-1 \ make=4.3-4.1build2 \ - curl=8.9.1-2ubuntu1 \ + curl=8.9.1-2ubuntu2 \ wget=1.24.5-1ubuntu2 \ - unzip=6.0-28ubuntu5 \ + unzip=6.0-28ubuntu6 \ gzip=1.12-1.1ubuntu1 \ zip=3.0-14 \ bzip2=1.0.8-6 \ @@ -61,9 +60,8 @@ RUN echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/90forceyes && \ sudo apt-get install --no-install-recommends -y \ docker-ce=${DOCKER_VERSION} \ docker-ce-cli=${DOCKER_VERSION} \ - containerd.io=1.7.21-1 \ - docker-buildx-plugin=${DOCKER_BUILDX_VERSION} \ - docker-compose-plugin=${DOCKER_COMPOSE_VERSION} && \ + containerd.io=${CONTAINERD_VERSION} \ + docker-buildx-plugin=${DOCKER_BUILDX_VERSION} && \ curl -L https://cache.agilebits.com/dist/1P/op2/pkg/v${ONEPASSWORD_VERSION}/op_linux_amd64_v${ONEPASSWORD_VERSION}.zip -o op.zip && \ unzip -o op.zip && sudo mv op /usr/local/bin/op && \ rm op.zip && rm op.sig && \