From: Dessalines Date: Fri, 15 Jan 2021 18:31:10 +0000 (-0500) Subject: Trying to fix arm build. X-Git-Url: http://these/git/ui/assets/%7B%60https:/matrix.to?a=commitdiff_plain;h=8cfee9ca7dc0e60801bca0bd98db42904e315025;p=lemmy.git Trying to fix arm build. --- diff --git a/.drone.yml b/.drone.yml index 9924af5f..f6044c4b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -12,7 +12,6 @@ steps: commands: - apk add git - git submodule update --init --recursive --remote - - find docs/ - name: chown repo image: ekidd/rust-musl-builder:1.47.0 @@ -96,6 +95,12 @@ platform: steps: + - name: fetch git submodules + image: node:15-alpine3.12 + commands: + - apk add git + - git submodule update --init --recursive --remote + - name: cargo test image: rust:1.47-slim-buster environment: diff --git a/docker/federation/docker-compose.yml b/docker/federation/docker-compose.yml index c3fc7601..f18f052a 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.4 + image: dessalines/lemmy-ui:0.9.0-rc.6 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.4 + image: dessalines/lemmy-ui:0.9.0-rc.6 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.4 + image: dessalines/lemmy-ui:0.9.0-rc.6 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.4 + image: dessalines/lemmy-ui:0.9.0-rc.6 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.4 + image: dessalines/lemmy-ui:0.9.0-rc.6 environment: - LEMMY_INTERNAL_HOST=lemmy-epsilon:8581 - LEMMY_EXTERNAL_HOST=localhost:8581 diff --git a/docker/prod/deploy.sh b/docker/prod/deploy.sh index 79bedce7..b0af8501 100755 --- a/docker/prod/deploy.sh +++ b/docker/prod/deploy.sh @@ -25,6 +25,7 @@ sed -i "s/dessalines\/lemmy:.*/dessalines\/lemmy:$new_tag/" ../prod/docker-compo git add ../dev/docker-compose.yml git add ../prod/docker-compose.yml +git add ../federation/docker-compose.yml # The commit git commit -m"Version $new_tag"