From 9680122a494c004cd200c97c6fc4fad91ea75c7e Mon Sep 17 00:00:00 2001
From: Josh Burman <jburman@yas.getyardstick.com>
Date: Wed, 27 Oct 2021 17:00:00 +0000
Subject: [PATCH] removed uneeded docker files and removed env vars from proper
 dockerfile

---
 .docker-compose/Dockerfile  |  7 -------
 Dockerfile                  | 28 ----------------------------
 docker-compose.override.yml |  2 --
 docker-compose.yml          |  9 ---------
 docker_tag.txt              |  1 -
 5 files changed, 47 deletions(-)
 delete mode 100644 Dockerfile
 delete mode 100644 docker-compose.override.yml
 delete mode 100644 docker-compose.yml
 delete mode 100644 docker_tag.txt

diff --git a/.docker-compose/Dockerfile b/.docker-compose/Dockerfile
index e8babba..1c70967 100644
--- a/.docker-compose/Dockerfile
+++ b/.docker-compose/Dockerfile
@@ -17,12 +17,5 @@ COPY . /app
 
 WORKDIR /app/app
 
-ENV SOLVER_AWS_ACCESS_KEY_ID AKIAWUAUNMG45GJZT2I6
-ENV SOLVER_AWS_SECRET_ACCESS_KEY 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
-ENV SOLVER_INGEST_BUCKET measure-development-solver-ingest
-ENV MEASURE_PROCESSED_BUCKET measure-development-solver-processed
-ENV SOLVER_SQS_INGEST_QUEUE https://sqs.ca-central-1.amazonaws.com/455309353401/measure-development-solver-ingest
-ENV SOLVER_AWS_REGION ca-central-1
-
 # CMD [ "python", "main.py" ]
 CMD tail -f /dev/null
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index e8babba..0000000
--- a/Dockerfile
+++ /dev/null
@@ -1,28 +0,0 @@
-FROM python:3.9.6
-
-RUN mkdir /app
-WORKDIR /app
-
-RUN python -m pip install pulp
-RUN svn checkout https://projects.coin-or.org/svn/Cbc/releases/2.9.8 Cbc-2.9.8
-RUN cd Cbc-2.9.8 && \
-    ./configure && \
-    make && \
-    make install
-RUN python -m pip install pydantic
-RUN python -m pip install pySqsListener
-
-# Bundle app source
-COPY . /app
-
-WORKDIR /app/app
-
-ENV SOLVER_AWS_ACCESS_KEY_ID AKIAWUAUNMG45GJZT2I6
-ENV SOLVER_AWS_SECRET_ACCESS_KEY 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
-ENV SOLVER_INGEST_BUCKET measure-development-solver-ingest
-ENV MEASURE_PROCESSED_BUCKET measure-development-solver-processed
-ENV SOLVER_SQS_INGEST_QUEUE https://sqs.ca-central-1.amazonaws.com/455309353401/measure-development-solver-ingest
-ENV SOLVER_AWS_REGION ca-central-1
-
-# CMD [ "python", "main.py" ]
-CMD tail -f /dev/null
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
deleted file mode 100644
index b25559e..0000000
--- a/docker-compose.override.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-override_file_placeholder:
-  image: busybox
diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index 9f5ea03..0000000
--- a/docker-compose.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-measure-solver:
-  build: /apps/measure-solver/.docker-compose
-  environment:
-    VIRTUAL_HOST: yssolver.localhost
-    MEASURE_BASE_URL: http://admin.localhost
-  dns:
-    - 172.17.0.1
-  volumes:
-    - /apps/measure-solver:/app
diff --git a/docker_tag.txt b/docker_tag.txt
deleted file mode 100644
index 9e11b32..0000000
--- a/docker_tag.txt
+++ /dev/null
@@ -1 +0,0 @@
-0.3.1