From ed5b0514f52f848e53785dee5fe8de63780cf092 Mon Sep 17 00:00:00 2001 From: Samuel Meenzen Date: Wed, 16 Jul 2025 19:00:10 +0200 Subject: [PATCH] chore: remove old ci files --- .gitlab/setup-buildx-remote-builders.sh | 37 ----------- docker/ci-binaries-packaging.Dockerfile | 84 ------------------------- docker/healthcheck.sh | 19 ------ 3 files changed, 140 deletions(-) delete mode 100644 .gitlab/setup-buildx-remote-builders.sh delete mode 100644 docker/ci-binaries-packaging.Dockerfile delete mode 100644 docker/healthcheck.sh diff --git a/.gitlab/setup-buildx-remote-builders.sh b/.gitlab/setup-buildx-remote-builders.sh deleted file mode 100644 index 29d50dde..00000000 --- a/.gitlab/setup-buildx-remote-builders.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh -set -eux - -# --------------------------------------------------------------------- # -# # -# Configures docker buildx to use a remote server for arm building. # -# Expects $SSH_PRIVATE_KEY to be a valid ssh ed25519 private key with # -# access to the server $ARM_SERVER_USER@$ARM_SERVER_IP # -# # -# This is expected to only be used in the official CI/CD pipeline! # -# # -# Requirements: openssh-client, docker buildx # -# Inspired by: https://depot.dev/blog/building-arm-containers # -# # -# --------------------------------------------------------------------- # - -cat "$BUILD_SERVER_SSH_PRIVATE_KEY" | ssh-add - - -# Test server connections: -ssh "$ARM_SERVER_USER@$ARM_SERVER_IP" "uname -a" -ssh "$AMD_SERVER_USER@$AMD_SERVER_IP" "uname -a" - -# Connect remote arm64 server for all arm builds: -docker buildx create \ - --name "multi" \ - --driver "docker-container" \ - --platform "linux/arm64,linux/arm/v7" \ - "ssh://$ARM_SERVER_USER@$ARM_SERVER_IP" - -# Connect remote amd64 server for adm64 builds: -docker buildx create --append \ - --name "multi" \ - --driver "docker-container" \ - --platform "linux/amd64" \ - "ssh://$AMD_SERVER_USER@$AMD_SERVER_IP" - -docker buildx use multi diff --git a/docker/ci-binaries-packaging.Dockerfile b/docker/ci-binaries-packaging.Dockerfile deleted file mode 100644 index 9c7b99e9..00000000 --- a/docker/ci-binaries-packaging.Dockerfile +++ /dev/null @@ -1,84 +0,0 @@ -# syntax=docker/dockerfile:1 -# --------------------------------------------------------------------------------------------------------- -# This Dockerfile is intended to be built as part of Conduit's CI pipeline. -# It does not build Conduit in Docker, but just copies the matching build artifact from the build jobs. -# -# It is mostly based on the normal Conduit Dockerfile, but adjusted in a few places to maximise caching. -# Credit's for the original Dockerfile: Weasy666. -# --------------------------------------------------------------------------------------------------------- - -FROM docker.io/alpine:3.22.1@sha256:4bcff63911fcb4448bd4fdacec207030997caf25e9bea4045fa6c8c44de311d1 AS runner - - -# Standard port on which Conduit launches. -# You still need to map the port when using the docker command or docker-compose. -EXPOSE 6167 - -# Users are expected to mount a volume to this directory: -ARG DEFAULT_DB_PATH=/var/lib/matrix-conduit - -ENV CONDUIT_PORT=6167 \ - CONDUIT_ADDRESS="0.0.0.0" \ - CONDUIT_DATABASE_PATH=${DEFAULT_DB_PATH} \ - CONDUIT_CONFIG='' -# └─> Set no config file to do all configuration with env vars - -# Conduit needs: -# ca-certificates: for https -# iproute2: for `ss` for the healthcheck script -RUN apk add --no-cache \ - ca-certificates \ - iproute2 - -ARG CREATED -ARG VERSION -ARG GIT_REF -# Labels according to https://github.com/opencontainers/image-spec/blob/master/annotations.md -# including a custom label specifying the build command -LABEL org.opencontainers.image.created=${CREATED} \ - org.opencontainers.image.authors="Conduit Contributors" \ - org.opencontainers.image.title="Conduit" \ - org.opencontainers.image.version=${VERSION} \ - org.opencontainers.image.vendor="Conduit Contributors" \ - org.opencontainers.image.description="A Matrix homeserver written in Rust" \ - org.opencontainers.image.url="https://conduit.rs/" \ - org.opencontainers.image.revision=${GIT_REF} \ - org.opencontainers.image.source="https://gitlab.com/famedly/conduit.git" \ - org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.documentation="https://gitlab.com/famedly/conduit" \ - org.opencontainers.image.ref.name="" - - -# Test if Conduit is still alive, uses the same endpoint as Element -COPY ./docker/healthcheck.sh /srv/conduit/healthcheck.sh -HEALTHCHECK --start-period=5s --interval=5s CMD ./healthcheck.sh - -# Improve security: Don't run stuff as root, that does not need to run as root: -# Most distros also use 1000:1000 for the first real user, so this should resolve volume mounting problems. -ARG USER_ID=1000 -ARG GROUP_ID=1000 -RUN set -x ; \ - deluser --remove-home www-data ; \ - addgroup -S -g ${GROUP_ID} conduit 2>/dev/null ; \ - adduser -S -u ${USER_ID} -D -H -h /srv/conduit -G conduit -g conduit conduit 2>/dev/null ; \ - addgroup conduit conduit 2>/dev/null && exit 0 ; exit 1 - -# Change ownership of Conduit files to conduit user and group -RUN chown -cR conduit:conduit /srv/conduit && \ - chmod +x /srv/conduit/healthcheck.sh && \ - mkdir -p ${DEFAULT_DB_PATH} && \ - chown -cR conduit:conduit ${DEFAULT_DB_PATH} - -# Change user to conduit -USER conduit -# Set container home directory -WORKDIR /srv/conduit - -# Run Conduit and print backtraces on panics -ENV RUST_BACKTRACE=1 -ENTRYPOINT [ "/srv/conduit/conduit" ] - -# Depending on the target platform (e.g. "linux/arm/v7", "linux/arm64/v8", or "linux/amd64") -# copy the matching binary into this docker image -ARG TARGETPLATFORM -COPY --chown=conduit:conduit ./$TARGETPLATFORM /srv/conduit/conduit diff --git a/docker/healthcheck.sh b/docker/healthcheck.sh deleted file mode 100644 index 62f2f987..00000000 --- a/docker/healthcheck.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -# If the config file does not contain a default port and the CONDUIT_PORT env is not set, create -# try to get port from process list -if [ -z "${CONDUIT_PORT}" ]; then - CONDUIT_PORT=$(ss -tlpn | grep conduit | grep -m1 -o ':[0-9]*' | grep -m1 -o '[0-9]*') -fi - -# If CONDUIT_ADDRESS is not set try to get the address from the process list -if [ -z "${CONDUIT_ADDRESS}" ]; then - CONDUIT_ADDRESS=$(ss -tlpn | awk -F ' +|:' '/conduit/ { print $4 }') -fi - -# The actual health check. -# We try to first get a response on HTTP and when that fails on HTTPS and when that fails, we exit with code 1. -# TODO: Change this to a single wget call. Do we have a config value that we can check for that? -wget --no-verbose --tries=1 --spider "http://${CONDUIT_ADDRESS}:${CONDUIT_PORT}/_matrix/client/versions" || \ - wget --no-verbose --tries=1 --spider "https://${CONDUIT_ADDRESS}:${CONDUIT_PORT}/_matrix/client/versions" || \ - exit 1