Isomorphic docker (#1124)

[lemmy.git] / docker / prod / deploy.sh

diff --git a/docker/prod/deploy.sh b/docker/prod/deploy.sh
index 46ef77657aac578e725ad7edebc975f04e4896f3..a0a8dd6c77a33cacc48870dd76ec2b88b66384ec 100755 (executable)
--- a/docker/prod/deploy.sh
+++ b/docker/prod/deploy.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
 set -e
-git checkout master
+git checkout main
 
 # Import translations
 git fetch weblate
-git merge weblate/master
+git merge weblate/main
 
 # Creating the new tag
 new_tag="$1"
@@ -12,11 +12,9 @@ third_semver=$(echo $new_tag | cut -d "." -f 3)
 
 # Setting the version on the front end
 cd ../../
-echo "export const version: string = '$new_tag';" > "ui/src/version.ts"
-git add "ui/src/version.ts"
 # Setting the version on the backend
-echo "pub const VERSION: &str = \"$new_tag\";" > "server/src/version.rs"
-git add "server/src/version.rs"
+echo "pub const VERSION: &str = \"$new_tag\";" > "src/version.rs"
+git add "src/version.rs"
 # Setting the version for Ansible
 echo $new_tag > "ansible/VERSION"
 git add "ansible/VERSION"
@@ -26,55 +24,39 @@ cd docker/prod || exit
 # Changing the docker-compose prod
 sed -i "s/dessalines\/lemmy:.*/dessalines\/lemmy:$new_tag/" ../prod/docker-compose.yml
 sed -i "s/dessalines\/lemmy:.*/dessalines\/lemmy:$new_tag/" ../../ansible/templates/docker-compose.yml
+sed -i "s/dessalines\/lemmy:v.*/dessalines\/lemmy:$new_tag/" ../travis/docker_push.sh
 git add ../prod/docker-compose.yml
 git add ../../ansible/templates/docker-compose.yml
+git add ../travis/docker_push.sh
 
 # The commit
 git commit -m"Version $new_tag"
 git tag $new_tag
 
-export COMPOSE_DOCKER_CLI_BUILD=1
-export DOCKER_BUILDKIT=1
-
-# Rebuilding docker
-docker build ../../ -f Dockerfile
-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
-else
-  docker manifest create dessalines/lemmy:$new_tag \
-  dessalines/lemmy:x64-$new_tag
-fi
-
-docker manifest push dessalines/lemmy:$new_tag
+# Now doing the building on travis, but leave this in for when you need to do an arm build
+
+# export COMPOSE_DOCKER_CLI_BUILD=1
+# export DOCKER_BUILDKIT=1
+
+# # Rebuilding docker
+# if [ $third_semver -eq 0 ]; then
+#   # 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 \
+#     --push
+# else
+#   docker buildx build --platform linux/amd64 ../../ \
+#     --file Dockerfile \
+#     --tag dessalines/lemmy:$new_tag \
+#     --push
+# fi
 
 # Push
 git push origin $new_tag
 git push
 
 # Pushing to any ansible deploys
-cd ../../../lemmy-ansible || exit
-ansible-playbook -i prod playbooks/site.yml --vault-password-file vault_pass
+# cd ../../../lemmy-ansible || exit
+# ansible-playbook -i prod playbooks/site.yml --vault-password-file vault_pass