From 37c55fdcf4f09823ce2e978f9be013d52470d25f Mon Sep 17 00:00:00 2001
From: Frederik Ring <frederik.ring@gmail.com>
Date: Thu, 10 Oct 2019 10:00:02 +0200
Subject: [PATCH] normalize naming schemes for docker images

---
 .circleci/config.yml                    | 10 +++++-----
 .gitignore                              |  1 -
 Dockerrun.aws.json.production           |  2 +-
 Dockerrun.aws.json.staging              |  2 +-
 Makefile                                |  7 ++++---
 build/{proxy => }/Dockerfile            |  0
 build/{proxy => }/nginx.conf            |  0
 build/{proxy => }/robots.txt.production |  0
 build/{proxy => }/robots.txt.staging    |  0
 9 files changed, 11 insertions(+), 11 deletions(-)
 rename build/{proxy => }/Dockerfile (100%)
 rename build/{proxy => }/nginx.conf (100%)
 rename build/{proxy => }/robots.txt.production (100%)
 rename build/{proxy => }/robots.txt.staging (100%)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d3cc78e..506a03b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -28,12 +28,12 @@ jobs:
           keys:
             - v1-{{ .Branch }}
           paths:
-            - /caches/proxy.tar
+            - /caches/website.tar
       - run:
           name: Load Docker image layer cache
           command: |
             set +o pipefail
-            docker load -i /caches/proxy.tar | true
+            docker load -i /caches/website.tar | true
       - run:
           name: Build application Docker image
           command: |
@@ -46,16 +46,16 @@ jobs:
               export DOCKER_IMAGE_TAG="latest"
               export ROBOTS_FILE="robots.txt.staging"
             fi
-            docker build --build-arg siteurl=$SITEURL --build-arg robots=$ROBOTS_FILE -t offen/proxy:$DOCKER_IMAGE_TAG -f build/proxy/Dockerfile .
+            docker build --build-arg siteurl=$SITEURL --build-arg robots=$ROBOTS_FILE -t offen/website:$DOCKER_IMAGE_TAG -f build/Dockerfile .
       - run:
           name: Save Docker image layer cache
           command: |
             mkdir -p /caches
-            docker save -o /caches/proxy.tar offen/proxy
+            docker save -o /caches/website.tar offen/website
       - save_cache:
           key: v1-{{ .Branch }}-{{ epoch }}
           paths:
-            - /caches/proxy.tar
+            - /caches/website.tar
       - deploy:
           name: Push application Docker image
           command: |
diff --git a/.gitignore b/.gitignore
index 83affc4..e8d29c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,7 +18,6 @@ __pycache__/
 
 # Distribution / packaging
 .Python
-build/
 develop-eggs/
 dist/
 downloads/
diff --git a/Dockerrun.aws.json.production b/Dockerrun.aws.json.production
index a9398b8..2e104c0 100644
--- a/Dockerrun.aws.json.production
+++ b/Dockerrun.aws.json.production
@@ -11,7 +11,7 @@
   "containerDefinitions": [
     {
       "name": "proxy",
-      "image": "offen/proxy:stable",
+      "image": "offen/website:stable",
       "essential": true,
       "memory": 128,
       "portMappings": [
diff --git a/Dockerrun.aws.json.staging b/Dockerrun.aws.json.staging
index cd4b599..7a2d6e3 100644
--- a/Dockerrun.aws.json.staging
+++ b/Dockerrun.aws.json.staging
@@ -4,7 +4,7 @@
   "containerDefinitions": [
     {
       "name": "proxy",
-      "image": "offen/proxy:latest",
+      "image": "offen/website:latest",
       "essential": true,
       "memory": 128,
       "portMappings": [
diff --git a/Makefile b/Makefile
index 4204be0..36a7a0a 100644
--- a/Makefile
+++ b/Makefile
@@ -35,10 +35,11 @@ update:
 	@echo "Applying pending database migrations ..."
 	@docker-compose run server migrate
 
-DOCKER_IMAGE_TAG ?= latest
+DOCKER_IMAGE_TAG ?= local
 ROBOTS_FILE ?= robots.txt.staging
+SITEURL ?= http://localhost:8000
 
 build:
-	@docker build --build-arg siteurl=${SITEURL} --build-arg robots=${ROBOTS_FILE} -t offen/proxy:${DOCKER_IMAGE_TAG} -f build/proxy/Dockerfile .
+	@docker build --build-arg siteurl=${SITEURL} --build-arg robots=${ROBOTS_FILE} -t offen/website:${DOCKER_IMAGE_TAG} -f build/Dockerfile .
 
-.PHONY: setup build bootstrap build secret
+.PHONY: setup build bootstrap build
diff --git a/build/proxy/Dockerfile b/build/Dockerfile
similarity index 100%
rename from build/proxy/Dockerfile
rename to build/Dockerfile
diff --git a/build/proxy/nginx.conf b/build/nginx.conf
similarity index 100%
rename from build/proxy/nginx.conf
rename to build/nginx.conf
diff --git a/build/proxy/robots.txt.production b/build/robots.txt.production
similarity index 100%
rename from build/proxy/robots.txt.production
rename to build/robots.txt.production
diff --git a/build/proxy/robots.txt.staging b/build/robots.txt.staging
similarity index 100%
rename from build/proxy/robots.txt.staging
rename to build/robots.txt.staging