For untagged commits, include hash in version name (fixes #1563)

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

diff --git a/docker/prod/deploy.sh b/docker/prod/deploy.sh
index 2e8728180cc0a4f571ac08c0a2533e5f6fcf9e9f..d72a74e8e5309a2e72152b91acd37723505b1590 100755 (executable)
--- a/docker/prod/deploy.sh
+++ b/docker/prod/deploy.sh
@@ -1,58 +1,36 @@
 #!/bin/sh
 set -e
-git checkout main
-
-# Import translations
-git fetch weblate
-git merge weblate/main
+#git checkout main
 
 # Creating the new tag
 new_tag="$1"
 third_semver=$(echo $new_tag | cut -d "." -f 3)
 
-# Setting the version on the front end
-cd ../../
-# Setting the version on the backend
-echo "pub const VERSION: &str = \"$new_tag\";" > "server/src/version.rs"
-git add "server/src/version.rs"
-# Setting the version for Ansible
-echo $new_tag > "ansible/VERSION"
-git add "ansible/VERSION"
-
-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
-git add ../prod/docker-compose.yml
-git add ../../ansible/templates/docker-compose.yml
+# The ansible and docker installs should only update for non release-candidates
+# IE, when the third semver is a number, not '2-rc'
+if [ ! -z "${third_semver##*[!0-9]*}" ]; then
+  sed -i "s/dessalines\/lemmy:.*/dessalines\/lemmy:$new_tag/" ../prod/docker-compose.yml
+  sed -i "s/dessalines\/lemmy-ui:.*/dessalines\/lemmy-ui:$new_tag/" ../prod/docker-compose.yml
+  git add ../prod/docker-compose.yml
+
+  # Setting the version for Ansible
+  pushd ../../
+  echo $new_tag > "ansible/VERSION"
+  git add "ansible/VERSION"
+  popd
+fi
 
 # The commit
 git commit -m"Version $new_tag"
 git tag $new_tag
 
-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
+# export COMPOSE_DOCKER_CLI_BUILD=1
+# export DOCKER_BUILDKIT=1
 
 # 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