diff --git a/.gitea/PULL_REQUEST_TEMPLATE.md b/.gitea/PULL_REQUEST_TEMPLATE.md index 0e4e01b5..4210554b 100644 --- a/.gitea/PULL_REQUEST_TEMPLATE.md +++ b/.gitea/PULL_REQUEST_TEMPLATE.md @@ -1 +1,8 @@ -- [ ] I agree to release my code and all other changes of this PR under the Apache-2.0 license + + + +----------------------------------------------------------------------------- + +- [ ] I ran `cargo fmt`, `cargo clippy`, and `cargo test` +- [ ] I agree to release my code and all other changes of this MR under the Apache-2.0 license + diff --git a/Cross.toml b/Cross.toml deleted file mode 100644 index ba61eb29..00000000 --- a/Cross.toml +++ /dev/null @@ -1,4 +0,0 @@ -[target.x86_64-unknown-linux-gnu] -image = "fedora:rawhide" -#pre-build = ["dnf update -y && dnf install -y make automake gcc gcc-c++ kernel-devel clang llvm llvm-devel llvm-libs lld lld-devel liburing liburing-devel && dnf groupinstall -y \"Development Tools\" \"Development Libraries\""] -pre-build = ["dnf install -y liburing-devel llvm clang"] diff --git a/README.md b/README.md index afc838c9..faf31317 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,6 @@ I have tried, but: - unnecessary Matrix / developer politics - bikeshedding unnecessary or irrelevant things in MRs - disagreement with how the upstream project is maintained including the codebase -- infinitely broken CI/CD and no interest in fixing it or improving it - upstream maintainer inactivity - questionable community members - lack of MR reviews or issue triaging and no upstream maintainer interest in receiving help @@ -78,7 +77,14 @@ Liberapay: \ Ko-fi: \ GitHub Sponsors: - #### Logo No official conduwuit logo exists. Repo and Matrix room picture is from bran (<3). + +#### Mirrors of conduwuit + +GitHub: https://github.com/girlbossceo/conduwuit +GitLab: https://gitlab.com/girlbossceo/conduwuit +git.gay: https://git.gay/june/conduwuit +Codeberg: https://codeberg.org/girlbossceo/conduwuit +sourcehut: https://git.sr.ht/~girlbossceo/conduwuit \ No newline at end of file diff --git a/docker/ci-binaries-packaging.Dockerfile b/docker/ci-binaries-packaging.Dockerfile deleted file mode 100644 index 4c1199ed..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.16.0@sha256:4ff3ca91275773af45cb4b0834e12b7eb47d1c18f770a0b151381cd227f4c253 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