From 0782377ae368f894bdb48889d4e63b923130a2e9 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Wed, 17 Jun 2020 22:11:48 -0400 Subject: [PATCH] Version v0.6.75 --- ansible/VERSION | 2 +- docker/prod/deploy.sh | 44 ++++++++++------------------------ docker/prod/docker-compose.yml | 2 +- server/src/version.rs | 2 +- ui/src/version.ts | 2 +- 5 files changed, 17 insertions(+), 35 deletions(-) diff --git a/ansible/VERSION b/ansible/VERSION index fe18d878..d692f18b 100644 --- a/ansible/VERSION +++ b/ansible/VERSION @@ -1 +1 @@ -v0.6.74 +v0.6.75 diff --git a/docker/prod/deploy.sh b/docker/prod/deploy.sh index 0ad47bcd..4cd55c26 100755 --- a/docker/prod/deploy.sh +++ b/docker/prod/deploy.sh @@ -1,6 +1,6 @@ #!/bin/sh set -e -git checkout master +# git checkout master # Import translations git fetch weblate @@ -37,40 +37,22 @@ export COMPOSE_DOCKER_CLI_BUILD=1 export DOCKER_BUILDKIT=1 # Rebuilding docker -docker-compose build -docker tag dev_lemmy:latest dessalines/lemmy:x64-$new_tag -docker push dessalines/lemmy:x64-$new_tag - -# Build for Raspberry Pi / other archs - -# Arm currently not working -# docker build -t lemmy:armv7hf -f Dockerfile.armv7hf ../../ -# docker tag lemmy:armv7hf dessalines/lemmy:armv7hf-$new_tag -# docker push dessalines/lemmy:armv7hf-$new_tag - -# aarch64 -# Only do this on major releases (IE the third semver is 0) -if [ $third_semver -eq 0 ]; then - # Registering qemu binaries - docker run --rm --privileged multiarch/qemu-user-static:register --reset - - docker build -t lemmy:aarch64 -f Dockerfile.aarch64 ../../ - docker tag lemmy:aarch64 dessalines/lemmy:arm64-$new_tag - docker push dessalines/lemmy:arm64-$new_tag -fi - -# Creating the manifest for the multi-arch build if [ $third_semver -eq 0 ]; then - docker manifest create dessalines/lemmy:$new_tag \ - dessalines/lemmy:x64-$new_tag \ - dessalines/lemmy:arm64-$new_tag + docker buildx build --platform linux/amd64 ../../ \ + --file Dockerfile \ + --tag dessalines/lemmy:$new_tag \ + --file docker/dev/Dockerfile.m \ + --push . else - docker manifest create dessalines/lemmy:$new_tag \ - dessalines/lemmy:x64-$new_tag + # TODO get linux/arm/v7 build working + # Build for Raspberry Pi / other archs too + docker buildx build --platform linux/amd64,linux/arm64 ../../ \ + --file Dockerfile \ + --tag dessalines/lemmy:$new_tag \ + --file docker/dev/Dockerfile.m \ + --push . fi -docker manifest push dessalines/lemmy:$new_tag - # Push git push origin $new_tag git push diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index 246a9586..d309c123 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -12,7 +12,7 @@ services: restart: always lemmy: - image: dessalines/lemmy:v0.6.74 + image: dessalines/lemmy:v0.6.75 ports: - "127.0.0.1:8536:8536" restart: always diff --git a/server/src/version.rs b/server/src/version.rs index 529e3bff..3e7aeb03 100644 --- a/server/src/version.rs +++ b/server/src/version.rs @@ -1 +1 @@ -pub const VERSION: &str = "v0.6.74"; +pub const VERSION: &str = "v0.6.75"; diff --git a/ui/src/version.ts b/ui/src/version.ts index e6e11378..6218ae39 100644 --- a/ui/src/version.ts +++ b/ui/src/version.ts @@ -1 +1 @@ -export const version: string = 'v0.6.74'; +export const version: string = 'v0.6.75'; -- 2.44.1