diff --git a/.drone.yml b/.drone.yml index 5c68e2ccb..bb27984f9 100644 --- a/.drone.yml +++ b/.drone.yml @@ -21,13 +21,7 @@ steps: - name: cargo clippy image: ekidd/rust-musl-builder:1.50.0 - environment: - CARGO_HOME: /drone/src/.cargo commands: - - whoami - - ls -la ~/.cargo - - mv ~/.cargo . - - ls -la .cargo - cargo clippy --workspace --tests --all-targets --all-features -- -D warnings -D deprecated -D clippy::perf -D clippy::complexity -D clippy::dbg_macro - cargo clippy --workspace -- -D clippy::unwrap_used @@ -37,7 +31,6 @@ steps: LEMMY_DATABASE_URL: postgres://lemmy:password@database:5432/lemmy RUST_BACKTRACE: 1 RUST_TEST_THREADS: 1 - CARGO_HOME: /drone/src/.cargo commands: - sudo apt-get update - sudo apt-get -y install --no-install-recommends espeak postgresql-client @@ -45,8 +38,6 @@ steps: - name: cargo build image: ekidd/rust-musl-builder:1.50.0 - environment: - CARGO_HOME: /drone/src/.cargo commands: - cargo build - mv target/x86_64-unknown-linux-musl/debug/lemmy_server target/lemmy_server @@ -118,7 +109,6 @@ steps: LEMMY_DATABASE_URL: postgres://lemmy:password@database:5432/lemmy RUST_BACKTRACE: 1 RUST_TEST_THREADS: 1 - CARGO_HOME: /drone/src/.cargo commands: - apt-get update - apt-get -y install --no-install-recommends espeak postgresql-client libssl-dev pkg-config libpq-dev @@ -128,8 +118,6 @@ steps: # Using Debian here because there seems to be no official Alpine-based Rust docker image for ARM. - name: cargo build image: rust:1.50-slim-buster - environment: - CARGO_HOME: /drone/src/.cargo commands: - apt-get update - apt-get -y install --no-install-recommends libssl-dev pkg-config libpq-dev diff --git a/docker/dev/docker-compose.yml b/docker/dev/docker-compose.yml index 4f95d528b..a0e59ddf4 100644 --- a/docker/dev/docker-compose.yml +++ b/docker/dev/docker-compose.yml @@ -17,7 +17,7 @@ services: - iframely lemmy-ui: - image: dessalines/lemmy-ui:0.10.0-rc.9 + image: dessalines/lemmy-ui:0.10.0-rc.8 ports: - "1235:1234" restart: always diff --git a/docker/federation/docker-compose.yml b/docker/federation/docker-compose.yml index 4274aff59..77bb53fa6 100644 --- a/docker/federation/docker-compose.yml +++ b/docker/federation/docker-compose.yml @@ -29,7 +29,7 @@ services: - ./volumes/pictrs_alpha:/mnt lemmy-alpha-ui: - image: dessalines/lemmy-ui:0.10.0-rc.9 + image: dessalines/lemmy-ui:0.10.0-rc.8 environment: - LEMMY_INTERNAL_HOST=lemmy-alpha:8541 - LEMMY_EXTERNAL_HOST=localhost:8541 @@ -58,7 +58,7 @@ services: - ./volumes/postgres_alpha:/var/lib/postgresql/data lemmy-beta-ui: - image: dessalines/lemmy-ui:0.10.0-rc.9 + image: dessalines/lemmy-ui:0.10.0-rc.8 environment: - LEMMY_INTERNAL_HOST=lemmy-beta:8551 - LEMMY_EXTERNAL_HOST=localhost:8551 @@ -87,7 +87,7 @@ services: - ./volumes/postgres_beta:/var/lib/postgresql/data lemmy-gamma-ui: - image: dessalines/lemmy-ui:0.10.0-rc.9 + image: dessalines/lemmy-ui:0.10.0-rc.8 environment: - LEMMY_INTERNAL_HOST=lemmy-gamma:8561 - LEMMY_EXTERNAL_HOST=localhost:8561 @@ -117,7 +117,7 @@ services: # An instance with only an allowlist for beta lemmy-delta-ui: - image: dessalines/lemmy-ui:0.10.0-rc.9 + image: dessalines/lemmy-ui:0.10.0-rc.8 environment: - LEMMY_INTERNAL_HOST=lemmy-delta:8571 - LEMMY_EXTERNAL_HOST=localhost:8571 @@ -147,7 +147,7 @@ services: # An instance who has a blocklist, with lemmy-alpha blocked lemmy-epsilon-ui: - image: dessalines/lemmy-ui:0.10.0-rc.9 + image: dessalines/lemmy-ui:0.10.0-rc.8 environment: - LEMMY_INTERNAL_HOST=lemmy-epsilon:8581 - LEMMY_EXTERNAL_HOST=localhost:8581