From 72a70156ad1825fd7af36123b6faf22b55f8b1f5 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Sun, 24 Oct 2021 02:46:50 +0100
Subject: [PATCH] Revert "build: try building and pushing with Compose"

This reverts commit fc87e9abd02c8c523299363f5d50fe786562079e.
---
 docker-compose-production.yaml |  6 +-----
 run                            | 11 +++++++++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/docker-compose-production.yaml b/docker-compose-production.yaml
index dd3a2bfe..38b780ce 100644
--- a/docker-compose-production.yaml
+++ b/docker-compose-production.yaml
@@ -2,11 +2,7 @@ version: '2.4'
 
 services:
   web:
-    build:
-      context: .
-      dockerfile: tools/docker/images/Dockerfile
-      target: production
-    image: "ghcr.io/opdavies/oliverdavies-uk-web:${DOCKER_TAG:-latest}"
+    image: ghcr.io/opdavies/oliverdavies-uk-web
     ports:
       - 80:8080
     restart: unless-stopped
diff --git a/run b/run
index 30e260b5..b043b64a 100755
--- a/run
+++ b/run
@@ -4,6 +4,8 @@ set -e
 
 . .env
 
+DOCKER_WEB_IMAGE_NAME="ghcr.io/opdavies/${COMPOSE_PROJECT_NAME}-web"
+
 TTY=""
 if [[ ! -t 1 ]]; then
   TTY="-T"
@@ -19,11 +21,16 @@ function deploy {
 }
 
 function docker:build-images {
-  docker-compose build --file docker-compose-production.yaml
+  docker image build . \
+    --file tools/docker/images/Dockerfile \
+    --tag ${DOCKER_WEB_IMAGE_NAME}:${DOCKER_TAG} \
+    --tag ${DOCKER_WEB_IMAGE_NAME}:latest \
+    --target=production
 }
 
 function docker:push-images {
-  docker-compose push --file docker-compose-production.yaml
+  docker image push ${DOCKER_WEB_IMAGE_NAME}:${DOCKER_TAG}
+  docker image push ${DOCKER_WEB_IMAGE_NAME}:latest
 }
 
 function help {