Merge pull request #144 from LemmyNet/main

[pull] master from LemmyNet:main

scripts/postgres_15_to_16_upgrade.sh

@@ -24,7 +24,7 @@ echo "Removing the old postgres folder"
 sudo rm -rf volumes/postgres
 
 echo "Updating docker compose to use postgres version 16."
-sudo sed -i "s/image: .*postgres:.*/image: docker.io/postgres:16-alpine/" ./docker-compose.yml
+sudo sed -i "s/image: .*postgres:.*/image: docker.io\/postgres:16-alpine/" ./docker-compose.yml
 
 echo "Starting up new postgres..."
 sudo docker compose up -d postgres

scripts/release.sh

@@ -10,7 +10,7 @@ third_semver=$(echo $new_tag | cut -d "." -f 3)
 CWD="$(cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd -P)"
 cd $CWD/../
 
-# The ansible and docker installs should only update for non release-candidates
+# The 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
   pushd docker
@@ -20,14 +20,6 @@ if [ ! -z "${third_semver##*[!0-9]*}" ]; then
   git add docker-compose.yml
   git add federation/docker-compose.yml
   popd
-
-  # Setting the version for Ansible
-  pushd ../lemmy-ansible
-  echo $new_tag > "VERSION"
-  git add "VERSION"
-  git commit -m"Updating VERSION"
-  git push
-  popd
 fi
 
 # Update crate versions