Merge pull request #187 from lsst-sqre/tickets/DM-45138

DM-45138: Stop installling libpq-dev in Docker image

Dockerfile

@@ -1,4 +1,4 @@
-# This Dockerfile has four stages:
+# This Dockerfile has three stages:
 #
 # base-image
 #   Updates the base Python image with security patches and common system

requirements/main.in

@@ -16,10 +16,7 @@ arq
 astropy
 asyncpg
 click
-google-auth
-google-cloud-storage
 jinja2
-psycopg2
 pydantic
 pydantic-settings
 safir[arq,db,gcs]>=6.0.0

requirements/main.txt

@@ -324,7 +324,6 @@ google-auth==2.31.0 \
     --hash=sha256:042c4702efa9f7d3c48d3a69341c209381b125faa6dbf3ebe56bc7e40ae05c23 \
     --hash=sha256:87805c36970047247c8afe614d4e3af8eceafc1ebba0c679fe75ddd1d575e871
     # via
-    #   -r requirements/main.in
     #   google-api-core
     #   google-cloud-core
     #   google-cloud-storage
@@ -336,9 +335,7 @@ google-cloud-core==2.4.1 \
 google-cloud-storage==2.17.0 \
     --hash=sha256:49378abff54ef656b52dca5ef0f2eba9aa83dc2b2c72c78714b03a1a95fe9388 \
     --hash=sha256:5b393bc766b7a3bc6f5407b9e665b2450d36282614b7945e570b3480a456d1e1
-    # via
-    #   -r requirements/main.in
-    #   safir
+    # via safir
 google-crc32c==1.5.0 \
     --hash=sha256:024894d9d3cfbc5943f8f230e23950cd4906b2fe004c72e29b209420a1e6b05a \
     --hash=sha256:02c65b9817512edc6a4ae7c7e987fea799d2e0ee40c53ec573a692bee24de876 \
@@ -854,21 +851,6 @@ protobuf==5.27.2 \
     #   google-api-core
     #   googleapis-common-protos
     #   proto-plus
-psycopg2==2.9.9 \
-    --hash=sha256:121081ea2e76729acfb0673ff33755e8703d45e926e416cb59bae3a86c6a4981 \
-    --hash=sha256:38a8dcc6856f569068b47de286b472b7c473ac7977243593a288ebce0dc89516 \
-    --hash=sha256:426f9f29bde126913a20a96ff8ce7d73fd8a216cfb323b1f04da402d452853c3 \
-    --hash=sha256:5e0d98cade4f0e0304d7d6f25bbfbc5bd186e07b38eac65379309c4ca3193efa \
-    --hash=sha256:7e2dacf8b009a1c1e843b5213a87f7c544b2b042476ed7755be813eaf4e8347a \
-    --hash=sha256:a7653d00b732afb6fc597e29c50ad28087dcb4fbfb28e86092277a559ae4e693 \
-    --hash=sha256:ade01303ccf7ae12c356a5e10911c9e1c51136003a9a1d92f7aa9d010fb98372 \
-    --hash=sha256:bac58c024c9922c23550af2a581998624d6e02350f4ae9c5f0bc642c633a2d5e \
-    --hash=sha256:c92811b2d4c9b6ea0285942b2e7cac98a59e166d59c588fe5cfe1eda58e72d59 \
-    --hash=sha256:d1454bde93fb1e224166811694d600e746430c006fbb031ea06ecc2ea41bf156 \
-    --hash=sha256:d735786acc7dd25815e89cc4ad529a43af779db2e25aa7c626de864127e5a024 \
-    --hash=sha256:de80739447af31525feddeb8effd640782cf5998e1a4e9192ebdf829717e3913 \
-    --hash=sha256:ff432630e510709564c01dafdbe996cb552e0b9f3f065eb89bdce5bd31fabf4c
-    # via -r requirements/main.in
 pyasn1==0.6.0 \
     --hash=sha256:3a35ab2c4b5ef98e17dfdec8ab074046fbda76e281c5a706ccd82328cfc8f64c \
     --hash=sha256:cca4bb0f2df5504f02f6f8a775b6e416ff9b0b3b16f7ee80b5a3153d9b804473

requirements/tox.txt

@@ -192,25 +192,25 @@ urllib3==2.2.2 \
     #   -c requirements/main.txt
     #   docker
     #   requests
-uv==0.2.22 \
-    --hash=sha256:04bf5898fcee4345828997bb2f61ca9272d06725841963bdb440ead4fe4d36d8 \
-    --hash=sha256:0aeb42b38f097544b0acf7385a7986eea0a4d0deb2e79a83cf977b9392fadad5 \
-    --hash=sha256:14643aae26e64c0923a1d529a1fc33970e256e130e54fe29881be4ca01e2713a \
-    --hash=sha256:1cee1c22a88cced92787f854bf125b11063a4abd47248124fa955b867b9f0c64 \
-    --hash=sha256:1dcd11c661193038b724a3951e0d31a0446c008a5d7c256d0a60712a7451f317 \
-    --hash=sha256:4b959d0142cc367786a872e0bd4c899103bc35d6697d72476d4fcde847e68c23 \
-    --hash=sha256:4bdd12bd98230ea81d48aeca2e18cf81c77687cb09d9fb718055ae95d9f149f4 \
-    --hash=sha256:53908bbbad5be48a6d7e0342cc5a8dec1fdf446a0b4f70f81de75d1724cff433 \
-    --hash=sha256:685ca5e926270adfa35f201112d730b5854c41a68a0d8ed7acd78a12960b7000 \
-    --hash=sha256:721568ef2d0471281aefc161277806894cf33a772defdf0ba68af540f6a118c4 \
-    --hash=sha256:729eab4de1e414143c5271e108e67668152e739c305737516e1d47d9bce28649 \
-    --hash=sha256:af67bef31ac87d3a2e36aec0f8ed69c91228439c0b5ad437c87506f9eb47ce2c \
-    --hash=sha256:b800b457ca5fad729cd3a92fb2f07f5d41de0cc68bb4daf7dd209a3ba7766a43 \
-    --hash=sha256:bf8d2b345c47f7869f5e744906f959f8908ae01d84d31cf7c909f731cd320a5b \
-    --hash=sha256:c3bb82fbc7a40757d9d26cdb681d4bc2dca05951bb5e0e096ebea98d73456209 \
-    --hash=sha256:c813362f6aae89e6a780a85cef38c3cb4c841c33be550b8a36199051e1b10ace \
-    --hash=sha256:e32a6a30233da737b2c90ffd94fee3774f655dda67de6c260e4e1118775524aa \
-    --hash=sha256:ff74f8b3f911dcf1df2f12d8429433a29a8c506019038642f8a9db7450caa9fd
+uv==0.2.23 \
+    --hash=sha256:052d277d950d6a0a9d7a4e5d1b49ee29a5c2f421cff579e81c0b15bf77b16f53 \
+    --hash=sha256:09b1e7c082c92842c318d2e751388bfb34c4b39d5e53bddfae68782276996011 \
+    --hash=sha256:0fadea0f534c2296a91c6624fb48a65343d3781f879271667624882e5e7fbb54 \
+    --hash=sha256:162de3ec4c462611ae273b05967ef518cd488d049b4673bfa76160fb77b6f22f \
+    --hash=sha256:3e938c7ab240abf9b8aa692976a044bdbf961917bf336f2b793ef219e723a78c \
+    --hash=sha256:4b53383cf3a8d10c73037360591eeff458d9181ba0fa812895313ff73b62a556 \
+    --hash=sha256:4b93b30ff8a416d317071bf9ce85fd2a8c86b984dbed44e0092bd6935c68fab4 \
+    --hash=sha256:509b5b9c527e7e528838088076b745cd306796f65b562a1d891cf17e5e737359 \
+    --hash=sha256:55b028cf0966b14317a27cf959967c52d96fdad39ed4eb8d00c5b9c0876d6c94 \
+    --hash=sha256:607ac512ae22dd57de531f3d5ee4066cb96a16f2e13475326dff30b8c3105012 \
+    --hash=sha256:662a79e530b80e69224aff312f9aa15172e4b3b8f2e4b5f812ff8b3eb0fa64a3 \
+    --hash=sha256:693160ebe961510d5c59599fa5523fede124a0e6be3bb569dd0dce3678f1138a \
+    --hash=sha256:720de561d24bd71b86811d17c7e98349991b6e93cdbc7a1d889155ee789a2a77 \
+    --hash=sha256:81012dbe5cb1960a3a2359118b07d6695a1f157951320bf938d0e2b04d78f75c \
+    --hash=sha256:93f10122ac98844a1ab1c455b7db2df5564bc277f4d6c414129fef109c8a8b6f \
+    --hash=sha256:961272f76d56ec2e0c6c95466fc2e4b1a16e8abe75b378c87d4fc0ba0305f7c3 \
+    --hash=sha256:ec58983a7c161cf759de6a0a5fba64aa9b4aa013f877fc722e057a5244cc93c2 \
+    --hash=sha256:f032ac895c42dad2c7950016590a4c57e25b40f83ae84cc157f6d86fcdcb37de
     # via tox-uv
 virtualenv==20.26.3 \
     --hash=sha256:4c43a2a236279d9ea36a0d76f98d84bd6ca94ac4e0f4a3b9d46d05e10fea542a \

scripts/install-base-packages.sh

@@ -24,8 +24,8 @@ apt-get update
 # Install security updates.
 apt-get -y upgrade
 
-# Install dependencies required at runtime. libpq-dev is required by psycopg2.
-apt-get -y install --no-install-recommends libpq-dev
+# Install dependencies required at runtime (none currently).
+#apt-get -y install --no-install-recommends
 
 # Delete cached files we don't need anymore.
 apt-get clean