City adopts agreement with police union