Commit 70c9e81c authored by Silvio Rhatto's avatar Silvio Rhatto
Browse files

Merge branch 'feat/trixie' into 'main' 

Feat: switch to Debian trixie as the current stable (#3)

See merge request !2
parents e234dc2d fc6bb76f

onion-services/containers.yml

+3 −3
Original line number Diff line number Diff line
@@ -164,8 +164,8 @@ variables: 


      # Latest is the stable version (usually Debian stable)

      # Since the Arti image does not build for the "stable" suite, we're using

      # "bookworm" here, which is suboptimal, as requires manual update now and then.

      if [ "${DISTRO}" == "debian" ] && [ "${IMAGE_TAG}" == "bookworm" ]; then

      # "trixie" here, which is suboptimal, as requires manual update now and then.

      if [ "${DISTRO}" == "debian" ] && [ "${IMAGE_TAG}" == "trixie" ]; then

        echo -e "\e[33mAttempting to push image ${TAG_BASE}:latest\e[0m"

        podman image tag ${TAG_RELEASE} ${TAG_BASE}:latest

        podman push ${TAG_BASE}:latest
@@ -210,7 +210,7 @@ variables: 
# Basic cleanup job

# Inspired by https://gitlab.torproject.org/tpo/tpa/base-images

.cleanup-job:

  image: containers.torproject.org/tpo/tpa/base-images/podman:bookworm

  image: containers.torproject.org/tpo/tpa/base-images/podman:trixie

  stage: .post

  rules:

    # This job should always run, to prevent dangling (and failed) images in