From 7820806c26063305e7605818741d638ec8e09ce8 Mon Sep 17 00:00:00 2001
From: timmypidashev <pidashev.tim@gmail.com>
Date: Thu, 9 Nov 2023 11:05:10 -0800
Subject: [PATCH] continue working on dev workflow:

---
 compose.dev.yml     | 12 ++++++++++++
 dns/Corefile        |  5 +++++
 dns/Dockerfile.dev  |  4 ++++
 dns/Dockerfile.prod |  0
 web                 | 37 ++++++++++++++++---------------------
 5 files changed, 37 insertions(+), 21 deletions(-)
 create mode 100644 dns/Corefile
 create mode 100644 dns/Dockerfile.dev
 create mode 100644 dns/Dockerfile.prod

diff --git a/compose.dev.yml b/compose.dev.yml
index e69de29..5af9e60 100644
--- a/compose.dev.yml
+++ b/compose.dev.yml
@@ -0,0 +1,12 @@
+version: '3'
+
+
+services:
+  dns:
+    container_name: dns
+    build:
+      context: ./dns
+      dockerfile: Dockerfile.dev
+      args:
+        - BUILD_DATE=${BUILD_DATE}
+        - GIT_COMMIT=${GIT_COMMIT}
diff --git a/dns/Corefile b/dns/Corefile
new file mode 100644
index 0000000..8ea5437
--- /dev/null
+++ b/dns/Corefile
@@ -0,0 +1,5 @@
+.:53 {
+    forward . 8.8.8.8 9.9.9.9
+    log
+    errors
+}
diff --git a/dns/Dockerfile.dev b/dns/Dockerfile.dev
new file mode 100644
index 0000000..c2b4289
--- /dev/null
+++ b/dns/Dockerfile.dev
@@ -0,0 +1,4 @@
+# CoreDNS base image
+ARG ALPINE_VERSION=3.18
+ARG GO_VERSION=1.21.3
+ARG COREDNS_VERSION=v2.7.5
diff --git a/dns/Dockerfile.prod b/dns/Dockerfile.prod
new file mode 100644
index 0000000..e69de29
diff --git a/web b/web
index 38539dc..488fea3 100755
--- a/web
+++ b/web
@@ -1,50 +1,45 @@
 #!/bin/bash
 
 # Commandline args
-environment="$1"
-action="$2"
+action="$1"
+environment="$2"
 
 # Set the build arguments as environment variables
 export BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')
 export GIT_COMMIT=$(git rev-parse --short HEAD)
 
 
-
-case $environment in
-    dev)
-        if [ "$action" == "build" ];
+case $action in
+    build)
+        if [ "$environment" == "dev" ];
         then
-            echo "dev build"
+            echo "build dev"
         
-        elif [ "$action" == "run" ];
+        elif [ "$environment" == "prod" ];
         then
-            echo "dev run"
+            echo "build prod"
         
         else
-            echo "Invalid action. Use 'build' or 'run'."
+            echo "Invalid environment. Use 'dev' or 'prod'!"
             exit 1
         fi
         ;;
 
-    prod)
-        if [ "$action" == "build" ];
+    run)
+        if [ "$environment" == "dev" ];
         then
-            echo "prod build"
+            echo "run dev"
         
-        elif [ "$action" == "run" ];
+        elif [ "$environment" == "prod" ];
         then
-            echo "prod run"
+            echo "run prod"
 
-        elif [ "$action" == "push" ];
-        then
-            echo "prod push"
-        
         else
-            echo "Invalid action. Use 'build', 'run', or 'push'"
+            echo "Invalid environment. Use 'dev' or 'prod'!"
             exit 1
         fi
         ;;
     *)
-        echo "Invalid environment. Use 'dev' or 'prod'"
+        echo "Invalid action. Use 'build', 'run', or 'push'!"
         ;;
 esac