migrate image release process

This commit is contained in:
Ivan Gabaldon 2025-05-07 13:14:04 +02:00
parent a311c4a2b0
commit be04143b2a
No known key found for this signature in database
GPG Key ID: 075587C93FA67582
2 changed files with 74 additions and 51 deletions

View File

@ -134,23 +134,16 @@ jobs:
- name: Test - name: Test
env: env:
OVERRIDE_ARCH: "${{ matrix.arch }}" OVERRIDE_ARCH: "${{ matrix.arch }}"
GIT_URL: "${{ steps.build.outputs.git_url }}"
run: make ci.container.test run: make ci.container.test
release: release:
# TODO: Uncomment before merge # TODO: Uncomment before merge
# if: github.repository_owner == 'searxng' # if: github.repository_owner == 'searxng'
if: false if: false
name: Release (${{ matrix.arch }}) name: Release
runs-on: ubuntu-24.04-arm runs-on: ubuntu-24.04-arm
needs: test needs: test
strategy:
fail-fast: false
matrix:
arch:
- amd64
- arm64
- armv7
steps: steps:
- if: env.DOCKERHUB_USERNAME != '' - if: env.DOCKERHUB_USERNAME != ''
name: Checkout name: Checkout
@ -177,5 +170,6 @@ jobs:
- if: env.DOCKERHUB_USERNAME != '' - if: env.DOCKERHUB_USERNAME != ''
name: Release name: Release
env: env:
OVERRIDE_ARCH: "${{ matrix.arch }}" GIT_URL: "${{ steps.build.outputs.git_url }}"
DOCKER_TAG: "${{ steps.build.outputs.docker_tag }}"
run: make ci.container.push run: make ci.container.push

111
manage
View File

@ -477,6 +477,15 @@ ci.container.build() {
--file="./$dockerfile" --file="./$dockerfile"
podman push "ghcr.io/$container_image_organization/cache:$container_image_name-$arch$variant" podman push "ghcr.io/$container_image_organization/cache:$container_image_name-$arch$variant"
# From version.py
{
echo "version_string=$VERSION_STRING"
echo "version_tag=$VERSION_TAG"
echo "docker_tag=$DOCKER_TAG"
echo "git_url=$GIT_URL"
echo "git_branch=$GIT_BRANCH"
} >>"$GITHUB_OUTPUT"
) )
dump_return $? dump_return $?
} }
@ -524,9 +533,8 @@ ci.container.test() {
set -e set -e
# Define container image org/name # Define container image org/name
git_url="$(git remote get-url origin)"
# shellcheck disable=SC2001 # shellcheck disable=SC2001
container_image_organization="$(echo "$git_url" | sed 's|.*github\.com/\([^/]*\).*|\1|' || echo "searxng")" container_image_organization="$(echo "$GIT_URL" | sed 's|.*github\.com/\([^/]*\).*|\1|' || echo "searxng")"
container_image_name="searxng" container_image_name="searxng"
podman pull "ghcr.io/$container_image_organization/cache:$container_image_name-$arch$variant" podman pull "ghcr.io/$container_image_organization/cache:$container_image_name-$arch$variant"
@ -543,7 +551,6 @@ ci.container.test() {
# Wait until container is ready # Wait until container is ready
sleep 5 sleep 5
# TODO: Test failing
curl -vf --max-time 5 "http://localhost:8080/healthz" curl -vf --max-time 5 "http://localhost:8080/healthz"
kill $pid_logs &>/dev/null || true kill $pid_logs &>/dev/null || true
@ -557,34 +564,36 @@ ci.container.push() {
die 1 "This command is intended to be run in GitHub Actions" die 1 "This command is intended to be run in GitHub Actions"
fi fi
local parch=${OVERRIDE_ARCH:-$(uname -m)} # Architectures to release
local arch local release_archs=("amd64" "arm64" "armv7")
local variant
local platform
# Setup arch specific local archs=()
case $parch in local variants=()
"X64" | "x86_64" | "amd64") local platforms=()
arch="amd64"
variant="" for arch in "${release_archs[@]}"; do
platform="linux/$arch" case $arch in
;; "X64" | "x86_64" | "amd64")
"ARM64" | "aarch64" | "arm64") archs+=("amd64")
arch="arm64" variants+=("")
variant="" platforms+=("linux/${archs[-1]}")
platform="linux/$arch" ;;
;; "ARM64" | "aarch64" | "arm64")
"ARMV7" | "armhf" | "armv7l" | "armv7") archs+=("arm64")
arch="arm" variants+=("")
variant="v7" platforms+=("linux/${archs[-1]}")
platform="linux/$arch/$variant" ;;
;; "ARMV7" | "armv7" | "armhf" | "arm")
*) archs+=("arm")
err_msg "Unsupported architecture; (PARCH=\"$parch\")" variants+=("v7")
exit 1 platforms+=("linux/${archs[-1]}/${variants[-1]}")
;; ;;
esac *)
build_msg CONTAINER "Selected platform: $platform" err_msg "Unsupported architecture; (ARCH=\"${arch[-1]}\")"
exit 1
;;
esac
done
# Check if podman is installed # Check if podman is installed
if ! command -v podman &>/dev/null; then if ! command -v podman &>/dev/null; then
@ -595,23 +604,43 @@ ci.container.push() {
set -e set -e
# Define container image org/name # Define container image org/name
git_url="$(git remote get-url origin)"
# shellcheck disable=SC2001 # shellcheck disable=SC2001
container_image_organization="$(echo "$git_url" | sed 's|.*github\.com/\([^/]*\).*|\1|' || echo "searxng")" container_image_organization="$(echo "$GIT_URL" | sed 's|.*github\.com/\([^/]*\).*|\1|' || echo "searxng")"
container_image_name="searxng" container_image_name="searxng"
podman pull "ghcr.io/$container_image_organization/$container_image_name:cache-$arch$variant" # Pull archs
for i in "${!archs[@]}"; do
podman pull "ghcr.io/$container_image_organization/$container_image_name:cache-${archs[$i]}${variants[$i]}"
done
# Get version tag # Tags to release
container_image_tag_version=$(podman inspect --format='{{index .Config.Labels "org.opencontainers.image.revision"}}' \ tags=("latest")
"ghcr.io/$container_image_organization/$container_image_name:cache-$arch$variant") tags+=("$DOCKER_TAG")
# Recreate tags # Create manifests
podman tag "ghcr.io/$container_image_organization/$container_image_name:cache-$arch$variant" "docker.io/$container_image_organization/$container_image_name:latest" for tag in "${tags[@]}"; do
podman tag "ghcr.io/$container_image_organization/$container_image_name:cache-$arch$variant" "docker.io/$container_image_organization/$container_image_name:$container_image_tag_version" if ! podman manifest exists "localhost/$container_image_organization/$container_image_name:$tag"; then
podman manifest create "localhost/$container_image_organization/$container_image_name:$tag"
fi
podman push "docker.io/$container_image_organization/$container_image_name:latest" # Add archs to manifest
podman push "docker.io/$container_image_organization/$container_image_name:$container_image_tag_version" for i in "${!archs[@]}"; do
podman manifest add \
"localhost/$container_image_organization/$container_image_name:$tag" \
"containers-storage:ghcr.io/$container_image_organization/$container_image_name:cache-${archs[$i]}${variants[$i]}"
done
done
podman image list
# Push manifests
for tag in "${tags[@]}"; do
build_msg CONTAINER "Pushing manifest with tag: $tag"
podman manifest push \
"localhost/$container_image_organization/$container_image_name:$tag" \
"docker://docker.io/$container_image_organization/$container_image_name:$tag"
done
) )
dump_return $? dump_return $?
} }