From 97617d699d305df22ec3f7e03ac85a9aea6f5004 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Sun, 24 Jan 2021 22:44:35 -0500 Subject: [PATCH] Docker manifest arm amd64 deploy (#1367) * A first try at docker manifest. 1. * Fixing api version location * Version 0.9.0-rc.13 * Test docker. * Test docker 2. * Test docker 3. * Test docker 4. * Test docker 5. * Test docker 6. * Test docker 7. * Test docker 8. * Test docker 9. * Test docker 10. * Test docker 11. * Test docker 12. * Version 0.9.0-rc.14 * Test docker 13. * Test docker 14. * Version 0.9.0-rc.15 * Test docker 15. * Version 0.9.0-rc.16 * Test docker 16. * Version 0.9.0-rc.17 --- .drone.yml | 38 +++++++++++++++++++++++++++- ansible/VERSION | 2 +- crates/api/src/version.rs | 2 +- docker/dev/docker-compose.yml | 2 +- docker/federation/docker-compose.yml | 10 ++++---- docker/prod/deploy.sh | 4 +-- docker/prod/docker-compose.yml | 4 +-- 7 files changed, 49 insertions(+), 13 deletions(-) diff --git a/.drone.yml b/.drone.yml index bf3e767f2..425736600 100644 --- a/.drone.yml +++ b/.drone.yml @@ -7,6 +7,7 @@ platform: arch: amd64 steps: + - name: fetch git submodules image: node:15-alpine3.12 commands: @@ -68,6 +69,24 @@ steps: from_secret: docker_password repo: dessalines/lemmy auto_tag: true + auto_tag_suffix: linux-amd64 + when: + ref: + - refs/tags/* + + - name: push to docker manifest + image: plugins/manifest + settings: + username: + from_secret: docker_username + password: + from_secret: docker_password + target: "dessalines/lemmy:${DRONE_TAG}" + template: "dessalines/lemmy:${DRONE_TAG}-OS-ARCH" + platforms: + - linux/amd64 + - linux/arm64 + ignore_missing: true when: ref: - refs/tags/* @@ -140,11 +159,28 @@ steps: from_secret: docker_password repo: dessalines/lemmy auto_tag: true - auto_tag_suffix: arm64 + auto_tag_suffix: linux-arm64 when: ref: - refs/tags/* + - name: push to docker manifest + image: plugins/manifest + settings: + username: + from_secret: docker_username + password: + from_secret: docker_password + target: "dessalines/lemmy:${DRONE_TAG}" + template: "dessalines/lemmy:${DRONE_TAG}-OS-ARCH" + platforms: + - linux/amd64 + - linux/arm64 + ignore_missing: true + when: + ref: + - refs/tags/* + services: - name: database image: postgres:12-alpine diff --git a/ansible/VERSION b/ansible/VERSION index 89d8dec31..ee65f6ec9 100644 --- a/ansible/VERSION +++ b/ansible/VERSION @@ -1 +1 @@ -0.9.0-rc.12 +0.9.0-rc.17 diff --git a/crates/api/src/version.rs b/crates/api/src/version.rs index 6851a121b..88f7f873b 100644 --- a/crates/api/src/version.rs +++ b/crates/api/src/version.rs @@ -1 +1 @@ -pub const VERSION: &str = "0.9.0-rc.12"; +pub const VERSION: &str = "0.9.0-rc.17"; diff --git a/docker/dev/docker-compose.yml b/docker/dev/docker-compose.yml index 2b98d7112..56b0d0da2 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.12 + image: dessalines/lemmy-ui:0.9.0-rc.17 ports: - "1235:1234" restart: always diff --git a/docker/federation/docker-compose.yml b/docker/federation/docker-compose.yml index 22cbc0cbc..70393f721 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.12 + image: dessalines/lemmy-ui:0.9.0-rc.17 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.12 + image: dessalines/lemmy-ui:0.9.0-rc.17 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.12 + image: dessalines/lemmy-ui:0.9.0-rc.17 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.12 + image: dessalines/lemmy-ui:0.9.0-rc.17 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.12 + image: dessalines/lemmy-ui:0.9.0-rc.17 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 b0af85014..c4f9c2c8a 100755 --- a/docker/prod/deploy.sh +++ b/docker/prod/deploy.sh @@ -9,8 +9,8 @@ new_tag="$1" # Setting the version on the front end cd ../../ # Setting the version on the backend -echo "pub const VERSION: &str = \"$new_tag\";" > "lemmy_api/src/version.rs" -git add "lemmy_api/src/version.rs" +echo "pub const VERSION: &str = \"$new_tag\";" > "crates/api/src/version.rs" +git add "crates/api/src/version.rs" # Setting the version for Ansible echo $new_tag > "ansible/VERSION" git add "ansible/VERSION" diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index 4e9a7a829..426578039 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.12 + image: dessalines/lemmy:0.9.0-rc.17 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.12 + image: dessalines/lemmy-ui:0.9.0-rc.17 ports: - "1235:1234" restart: always