Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion .github/workflows/deploy-docker-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,17 @@ on:
tags:
- 'v*'

concurrency:
group: deploy-docker-images-${{ github.ref }}
cancel-in-progress: false

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
cancel-in-progress: false
queue: max

Not sure if this is equivalent, but github's documentation doesn't explain explicitly the scenario of setting cancel-in-progress: false


env:
REGISTRY: ghcr.io
DOCKER_DIRECTORY: docker/images
PLATFORMS: |
linux/amd64
linux/arm64
linux/arm/v7
PATH_TO_DEPLOY_SINGLE_DOCKER_IMAGE_WORKFLOW: .github/workflows/deploy-single-docker-image.yml
PATH_TO_DEPLOY_DOCKER_IMAGES_WORKFLOW: .github/workflows/deploy-docker-images.yml

Expand Down Expand Up @@ -97,7 +102,7 @@ jobs:
${{ needs.env-setup.outputs.path_to_deploy_docker_images_workflow }}
build_args: |
BASE_IMAGE_TAG=${{ needs.run-env-base.outputs.one_image_tag_short }}

BASE_IMAGE_REGISTRY=${{ needs.env-setup.outputs.docker_registry }}/${{ github.repository_owner }}/${{ needs.env-setup.outputs.repository_name }}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would be good to move this "calculation" to env-setup and add a output there so we don't need to maintain this at multiple locations

dev-env-base:
needs:
- env-setup
Expand All @@ -124,6 +129,7 @@ jobs:
${{ needs.env-setup.outputs.path_to_deploy_docker_images_workflow }}
build_args: |
BASE_IMAGE_TAG=${{ needs.build-env-base.outputs.one_image_tag_short }}
BASE_IMAGE_REGISTRY=${{ needs.env-setup.outputs.docker_registry }}/${{ github.repository_owner }}/${{ needs.env-setup.outputs.repository_name }}
build-kit-base:
needs:
- env-setup
Expand All @@ -150,6 +156,7 @@ jobs:
${{ needs.env-setup.outputs.path_to_deploy_docker_images_workflow }}
build_args: |
BASE_IMAGE_TAG=${{ needs.build-env-base.outputs.one_image_tag_short }}
BASE_IMAGE_REGISTRY=${{ needs.env-setup.outputs.docker_registry }}/${{ github.repository_owner }}/${{ needs.env-setup.outputs.repository_name }}
# Include deprecated images for backwards compatibility
deprecated-everest-clang-format:
if: ${{ needs.env-setup.outputs.build_deprecated_images == 'true' }}
Expand Down
7 changes: 4 additions & 3 deletions docker/images/build-env-base/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# syntax=docker/dockerfile:1
ARG BASE_IMAGE_TAG=latest
FROM ghcr.io/everest/everest-ci/run-env-base:${BASE_IMAGE_TAG}
ARG BASE_IMAGE_REGISTRY=ghcr.io/everest/everest-ci
FROM ${BASE_IMAGE_REGISTRY}/run-env-base:${BASE_IMAGE_TAG}

# renovate: datasource=repology depName=debian_12/git versioning=loose
ENV GIT_VERSION=1:2.39.5-0+deb12u3
Expand Down Expand Up @@ -67,9 +68,9 @@ ENV LIBBOOST_ALL_DEV_VERSION=1.74.0.3
# renovate: datasource=repology depName=debian_12/libsqlite3-dev versioning=loose
ENV LIBSQLITE3_DEV_VERSION=3.40.1-2+deb12u2
# renovate: datasource=repology depName=debian_12/openssl versioning=loose
ENV LIBSSL_DEV_VERSION=3.0.18-1~deb12u2
ENV LIBSSL_DEV_VERSION=3.0.19-1~deb12u2

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would be good to have a separate PR at least for those version bumps

# renovate: datasource=repology depName=debian_12/nodejs versioning=loose
ENV LIBNODE_DEV_VERSION=18.20.4+dfsg-1~deb12u1
ENV LIBNODE_DEV_VERSION=18.20.4+dfsg-1~deb12u2
# renovate: datasource=repology depName=debian_12/pkg-config versioning=loose
ENV PKG_CONFIG_VERSION=1.8.1-1
# renovate: datasource=repology depName=debian_12/libpcap-dev versioning=loose
Expand Down
3 changes: 2 additions & 1 deletion docker/images/build-kit-base/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# syntax=docker/dockerfile:1
ARG BASE_IMAGE_TAG=latest
FROM ghcr.io/everest/everest-ci/build-env-base:${BASE_IMAGE_TAG}
ARG BASE_IMAGE_REGISTRY=ghcr.io/everest/everest-ci
FROM ${BASE_IMAGE_REGISTRY}/build-env-base:${BASE_IMAGE_TAG}

ENV WORKSPACE_PATH=/workspace
ARG EXT_MOUNT=/ext
Expand Down
13 changes: 7 additions & 6 deletions docker/images/dev-env-base/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# syntax=docker/dockerfile:1
ARG BASE_IMAGE_TAG=latest
FROM ghcr.io/everest/everest-ci/build-env-base:${BASE_IMAGE_TAG}
ARG BASE_IMAGE_REGISTRY=ghcr.io/everest/everest-ci
FROM ${BASE_IMAGE_REGISTRY}/build-env-base:${BASE_IMAGE_TAG}

ARG USERNAME=docker
ARG USER_UID=1000
Expand Down Expand Up @@ -67,11 +68,11 @@ ENV CA_CERTIFICATES_VERSION=20230311+deb12u1
ENV CURL_VERSION=7.88.1-10+deb12u14

# Not managed by renovate, because no available datasource
ENV DOCKER_CE_VERSION=5:27.0.3-1~debian.12~bookworm
ENV DOCKER_CE_CLI_VERSION=5:27.1.1-1~debian.12~bookworm
ENV CONTAINERD_IO_VERSION=1.7.19-1
ENV DOCKER_BUILDX_PLUGIN_VERSION=0.16.1-1~debian.12~bookworm
ENV DOCKER_COMPOSE_PLUGIN_VERSION=2.29.1-1~debian.12~bookworm
ENV DOCKER_CE_VERSION=5:29.5.0-1~debian.12~bookworm
ENV DOCKER_CE_CLI_VERSION=5:29.5.0-1~debian.12~bookworm
ENV CONTAINERD_IO_VERSION=2.2.3-1~debian.12~bookworm
ENV DOCKER_BUILDX_PLUGIN_VERSION=0.34.0-1~debian.12~bookworm
ENV DOCKER_COMPOSE_PLUGIN_VERSION=5.1.3-1~debian.12~bookworm

# Development Tools - Docker
RUN apt update \
Expand Down
6 changes: 3 additions & 3 deletions docker/images/run-env-base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
FROM debian:12-slim

# renovate: datasource=repology depName=debian_12/openjdk-17 versioning=loose
ENV OPENJDK_17_JRE_VERSION=17.0.18+8-1~deb12u1
ENV OPENJDK_17_JRE_VERSION=17.0.19+10-1~deb12u2
# renovate: datasource=repology depName=debian_12/nodejs versioning=loose
ENV NODEJS_VERSION=18.20.4+dfsg-1~deb12u1
ENV NODEJS_VERSION=18.20.4+dfsg-1~deb12u2
# renovate: datasource=repology depName=debian_12/npm versioning=loose
ENV NPM_VERSION=9.2.0~ds1-1
# renovate: datasource=repology depName=debian_12/python3-pip versioning=loose
Expand All @@ -20,7 +20,7 @@ ENV LIBBOOST_CHRONO1_74_0_VERSION=1.74.0+ds1-21
# renovate: datasource=repology depName=debian_12/boost1.74 versioning=loose
ENV LIBBOOST_SYSTEM1_74_0_VERSION=1.74.0+ds1-21
# renovate: datasource=repology depName=debian_12/openssl versioning=loose
ENV LIBSSL3_VERSION=3.0.18-1~deb12u2
ENV LIBSSL3_VERSION=3.0.19-1~deb12u2
# renovate: datasource=repology depName=debian_12/curl versioning=loose
ENV LIBCURL4_VERSION=7.88.1-10+deb12u14
# renovate: datasource=repology depName=debian_12/libcap2 versioning=loose
Expand Down