From ab7381f0ca473197c3700d2f5f5b01e6c8ddaa1a Mon Sep 17 00:00:00 2001 From: James Campbell Date: Tue, 14 Jan 2025 01:59:18 -0500 Subject: [PATCH] Tidy up a bit --- Makefile | 12 ++++++------ Dockerfile-deb => docker/Dockerfile-deb | 0 Dockerfile-el7 => docker/Dockerfile-el7 | 0 Dockerfile-rpm => docker/Dockerfile-rpm | 0 requirements.yml | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) rename Dockerfile-deb => docker/Dockerfile-deb (100%) rename Dockerfile-el7 => docker/Dockerfile-el7 (100%) rename Dockerfile-rpm => docker/Dockerfile-rpm (100%) diff --git a/Makefile b/Makefile index b892f6f..af0f12a 100644 --- a/Makefile +++ b/Makefile @@ -127,11 +127,11 @@ package-rpm: docker: deb-package-image rpm-package-image -deb-package-image: Dockerfile-deb - docker build -t $(DEB_IMAGE) -f Dockerfile-deb . +deb-package-image: docker/Dockerfile-deb + docker build -t $(DEB_IMAGE) -f docker/Dockerfile-deb . -rpm-package-image: Dockerfile-rpm - docker build -t $(RPM_IMAGE) -f Dockerfile-rpm . +rpm-package-image: docker/Dockerfile-rpm + docker build -t $(RPM_IMAGE) -f docker/Dockerfile-rpm . -el7-package-image: Dockerfile-el7 - docker build -t $(EL7_IMAGE) -f Dockerfile-el7 . +el7-package-image: docker/Dockerfile-el7 + docker build -t $(EL7_IMAGE) -f docker/Dockerfile-el7 . diff --git a/Dockerfile-deb b/docker/Dockerfile-deb similarity index 100% rename from Dockerfile-deb rename to docker/Dockerfile-deb diff --git a/Dockerfile-el7 b/docker/Dockerfile-el7 similarity index 100% rename from Dockerfile-el7 rename to docker/Dockerfile-el7 diff --git a/Dockerfile-rpm b/docker/Dockerfile-rpm similarity index 100% rename from Dockerfile-rpm rename to docker/Dockerfile-rpm diff --git a/requirements.yml b/requirements.yml index 6612b4c..b2cce68 100644 --- a/requirements.yml +++ b/requirements.yml @@ -1,2 +1,2 @@ -psycopg[binary,pool] +psycopg pyyaml