From 0b28e1442f212aad491faa204e875487625fb296 Mon Sep 17 00:00:00 2001 From: Jonathon Date: Thu, 19 Oct 2023 10:08:29 +0100 Subject: [PATCH] Remove Router-Postgres from projects We no longer need this compose path as the Postgres version of Router is no longer a standalone fork/app but a branch of the original. --- projects/router-postgres/Dockerfile | 1 - projects/router-postgres/Makefile | 4 -- projects/router-postgres/docker-compose.yml | 49 --------------------- 3 files changed, 54 deletions(-) delete mode 100644 projects/router-postgres/Dockerfile delete mode 100644 projects/router-postgres/Makefile delete mode 100644 projects/router-postgres/docker-compose.yml diff --git a/projects/router-postgres/Dockerfile b/projects/router-postgres/Dockerfile deleted file mode 100644 index 0a7beb6d..00000000 --- a/projects/router-postgres/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -FROM golang:1.20.2 diff --git a/projects/router-postgres/Makefile b/projects/router-postgres/Makefile deleted file mode 100644 index 8be2d6b8..00000000 --- a/projects/router-postgres/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -router-postgres: clone-router-postgres - $(GOVUK_DOCKER) up -d postgres-14 - $(GOVUK_DOCKER) run $@-lite make build - diff --git a/projects/router-postgres/docker-compose.yml b/projects/router-postgres/docker-compose.yml deleted file mode 100644 index 4314aaa4..00000000 --- a/projects/router-postgres/docker-compose.yml +++ /dev/null @@ -1,49 +0,0 @@ -version: '3.7' - -x-router: &router-postgres - build: - context: . - dockerfile: projects/router-postgres/Dockerfile - image: router-postgres - volumes: - - go:/go - - ${GOVUK_ROOT_DIR:-~/govuk}/router-postgres:/go/src/github.com/alphagov/router-postgres:delegated - - root-home:/root - working_dir: /go/src/github.com/alphagov/router-postgres - -services: - router-postgres-lite: &router-postgres-lite - <<: *router-postgres - depends_on: - - postgres-14 - environment: - GOFLAGS: -buildvcs=false - BINARY: /go/src/github.com/alphagov/router-postgres/router-postgres - DEBUG: "true" - DATABASE_URL: "postgresql://postgres@postgres-14/router?sslmode=disable" - TEST_DATABASE_URL: "postgresql://postgres@postgres-14/router-test?sslmode=disable" - - router-postgres-app: &router-postgres-app - <<: *router-postgres - depends_on: - - postgres-14 - - nginx-proxy - expose: - - "8080" - - "3055" - environment: - VIRTUAL_HOST: router-postgres.dev.gov.uk,www.dev.gov.uk,www-origin.dev.gov.uk - VIRTUAL_PORT: 8080 - DATABASE_URL: "postgresql://postgres@postgres-14/router?sslmode=disable" - ROUTER_APIADDR: :3055 - ROUTER_BACKEND_HEADER_TIMEOUT: 60s - command: ./router-postgres - - router-postgres-app-draft: &router-postgres-app-draft - <<: *router-postgres-app - environment: - VIRTUAL_HOST: draft-router.dev.gov.uk,draft-origin.dev.gov.uk - VIRTUAL_PORT: 8080 - DATABASE_URL: "postgresql://postgres@postgres-14/router" - ROUTER_APIADDR: :3055 - ROUTER_BACKEND_HEADER_TIMEOUT: 60s