From 25dd1a21e27f2a6b91bf8647beff13fbf11a58db Mon Sep 17 00:00:00 2001 From: Dessalines Date: Mon, 18 Jan 2021 08:04:32 -0500 Subject: [PATCH] Try arm fix (#1356) * Trying to fix arm build. * Version 0.9.0-rc.8 * Trying to fix arm build 2. * Version 0.9.0-rc.9 * Checking time when removing lto. * Version 0.9.0-rc.10 * Adding back in arm tests. * Version 0.9.0-rc.11 --- Cargo.toml | 3 --- ansible/VERSION | 2 +- docker/dev/docker-compose.yml | 2 +- docker/federation/docker-compose.yml | 10 +++++----- docker/prod/Dockerfile.arm | 2 +- docker/prod/docker-compose.yml | 4 ++-- lemmy_api/src/version.rs | 2 +- 7 files changed, 11 insertions(+), 14 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 6a60aa21..d1bcfa28 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,9 +6,6 @@ edition = "2018" [profile.dev] debug = 0 -[profile.release] -lto = true - [workspace] members = [ "lemmy_api", diff --git a/ansible/VERSION b/ansible/VERSION index 5270f1ca..fab93f48 100644 --- a/ansible/VERSION +++ b/ansible/VERSION @@ -1 +1 @@ -0.9.0-rc.7 +0.9.0-rc.11 diff --git a/docker/dev/docker-compose.yml b/docker/dev/docker-compose.yml index 3e016d31..6d4aed3e 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.9.0-rc.7 + image: dessalines/lemmy-ui:0.9.0-rc.11 ports: - "1235:1234" restart: always diff --git a/docker/federation/docker-compose.yml b/docker/federation/docker-compose.yml index bc31bbdf..2edd2847 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.9.0-rc.7 + image: dessalines/lemmy-ui:0.9.0-rc.11 environment: - LEMMY_INTERNAL_HOST=lemmy-alpha:8541 - LEMMY_EXTERNAL_HOST=localhost:8541 @@ -69,7 +69,7 @@ services: - ./volumes/postgres_alpha:/var/lib/postgresql/data lemmy-beta-ui: - image: dessalines/lemmy-ui:0.9.0-rc.7 + image: dessalines/lemmy-ui:0.9.0-rc.11 environment: - LEMMY_INTERNAL_HOST=lemmy-beta:8551 - LEMMY_EXTERNAL_HOST=localhost:8551 @@ -109,7 +109,7 @@ services: - ./volumes/postgres_beta:/var/lib/postgresql/data lemmy-gamma-ui: - image: dessalines/lemmy-ui:0.9.0-rc.7 + image: dessalines/lemmy-ui:0.9.0-rc.11 environment: - LEMMY_INTERNAL_HOST=lemmy-gamma:8561 - LEMMY_EXTERNAL_HOST=localhost:8561 @@ -150,7 +150,7 @@ services: # An instance with only an allowlist for beta lemmy-delta-ui: - image: dessalines/lemmy-ui:0.9.0-rc.7 + image: dessalines/lemmy-ui:0.9.0-rc.11 environment: - LEMMY_INTERNAL_HOST=lemmy-delta:8571 - LEMMY_EXTERNAL_HOST=localhost:8571 @@ -191,7 +191,7 @@ services: # An instance who has a blocklist, with lemmy-alpha blocked lemmy-epsilon-ui: - image: dessalines/lemmy-ui:0.9.0-rc.7 + image: dessalines/lemmy-ui:0.9.0-rc.11 environment: - LEMMY_INTERNAL_HOST=lemmy-epsilon:8581 - LEMMY_EXTERNAL_HOST=localhost:8581 diff --git a/docker/prod/Dockerfile.arm b/docker/prod/Dockerfile.arm index 675b19bf..e451fc56 100644 --- a/docker/prod/Dockerfile.arm +++ b/docker/prod/Dockerfile.arm @@ -22,7 +22,7 @@ RUN cp ./target/release/lemmy_server /app/lemmy_server # Build the docs FROM $RUST_BUILDER_IMAGE as docs WORKDIR /app -RUN cargo install --debug mdbook +RUN cargo install mdbook --git https://github.com/Nutomic/mdBook.git --branch localization --rev 0982a82 --force COPY docs ./docs RUN mdbook build docs/ diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index 3829beb1..a5118a91 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -12,7 +12,7 @@ services: restart: always lemmy: - image: dessalines/lemmy:0.9.0-rc.7 + image: dessalines/lemmy:0.9.0-rc.11 ports: - "127.0.0.1:8536:8536" restart: always @@ -26,7 +26,7 @@ services: - iframely lemmy-ui: - image: dessalines/lemmy-ui:0.9.0-rc.7 + image: dessalines/lemmy-ui:0.9.0-rc.11 ports: - "1235:1234" restart: always diff --git a/lemmy_api/src/version.rs b/lemmy_api/src/version.rs index 23c858cd..6622b2fb 100644 --- a/lemmy_api/src/version.rs +++ b/lemmy_api/src/version.rs @@ -1 +1 @@ -pub const VERSION: &str = "0.9.0-rc.7"; +pub const VERSION: &str = "0.9.0-rc.11"; -- 2.44.1