Version v0.6.75
This commit is contained in:
parent
bda657b638
commit
0782377ae3
5 changed files with 17 additions and 35 deletions
2
ansible/VERSION
vendored
2
ansible/VERSION
vendored
|
@ -1 +1 @@
|
||||||
v0.6.74
|
v0.6.75
|
||||||
|
|
44
docker/prod/deploy.sh
vendored
44
docker/prod/deploy.sh
vendored
|
@ -1,6 +1,6 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
set -e
|
set -e
|
||||||
git checkout master
|
# git checkout master
|
||||||
|
|
||||||
# Import translations
|
# Import translations
|
||||||
git fetch weblate
|
git fetch weblate
|
||||||
|
@ -37,40 +37,22 @@ export COMPOSE_DOCKER_CLI_BUILD=1
|
||||||
export DOCKER_BUILDKIT=1
|
export DOCKER_BUILDKIT=1
|
||||||
|
|
||||||
# Rebuilding docker
|
# 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
|
if [ $third_semver -eq 0 ]; then
|
||||||
# Registering qemu binaries
|
docker buildx build --platform linux/amd64 ../../ \
|
||||||
docker run --rm --privileged multiarch/qemu-user-static:register --reset
|
--file Dockerfile \
|
||||||
|
--tag dessalines/lemmy:$new_tag \
|
||||||
docker build -t lemmy:aarch64 -f Dockerfile.aarch64 ../../
|
--file docker/dev/Dockerfile.m \
|
||||||
docker tag lemmy:aarch64 dessalines/lemmy:arm64-$new_tag
|
--push .
|
||||||
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
|
|
||||||
else
|
else
|
||||||
docker manifest create dessalines/lemmy:$new_tag \
|
# TODO get linux/arm/v7 build working
|
||||||
dessalines/lemmy:x64-$new_tag
|
# 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
|
fi
|
||||||
|
|
||||||
docker manifest push dessalines/lemmy:$new_tag
|
|
||||||
|
|
||||||
# Push
|
# Push
|
||||||
git push origin $new_tag
|
git push origin $new_tag
|
||||||
git push
|
git push
|
||||||
|
|
2
docker/prod/docker-compose.yml
vendored
2
docker/prod/docker-compose.yml
vendored
|
@ -12,7 +12,7 @@ services:
|
||||||
restart: always
|
restart: always
|
||||||
|
|
||||||
lemmy:
|
lemmy:
|
||||||
image: dessalines/lemmy:v0.6.74
|
image: dessalines/lemmy:v0.6.75
|
||||||
ports:
|
ports:
|
||||||
- "127.0.0.1:8536:8536"
|
- "127.0.0.1:8536:8536"
|
||||||
restart: always
|
restart: always
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
pub const VERSION: &str = "v0.6.74";
|
pub const VERSION: &str = "v0.6.75";
|
||||||
|
|
2
ui/src/version.ts
vendored
2
ui/src/version.ts
vendored
|
@ -1 +1 @@
|
||||||
export const version: string = 'v0.6.74';
|
export const version: string = 'v0.6.75';
|
||||||
|
|
Loading…
Reference in a new issue