Release v1.7.6 - Reorg dockerfiles, version catchup. (#403)

* Release v1.7.6 - Reorg dockerfiles, version catchup. * Fix path * Fix paths again
echoboomer · Dec 31, 2023 · 9d85944 · 9d85944
1 parent 5928254
commit 9d85944
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 13 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -13,7 +13,7 @@ jobs:
           command: |
             echo 'export IMAGE_TAG=$(cat version)' >> "$BASH_ENV"
             source "$BASH_ENV"
-            docker build --tag $IMAGE_NAME:$IMAGE_TAG .
+            docker build --file ./build/Dockerfile --tag $IMAGE_NAME:$IMAGE_TAG .
   build-bot-arm64:
     environment:
       IMAGE_NAME: eb129/incident-bot
@@ -28,7 +28,7 @@ jobs:
           command: |
             echo 'export IMAGE_TAG=$(cat version)' >> "$BASH_ENV"
             source "$BASH_ENV"
-            docker build --platform linux/arm64 --file Dockerfile.arm64 --tag $IMAGE_NAME:$IMAGE_TAG-arm64 .
+            docker build --platform linux/arm64 --file ./build/Dockerfile.arm64 --tag $IMAGE_NAME:$IMAGE_TAG-arm64 .
   build-bot-lite:
     environment:
       IMAGE_NAME: eb129/incident-bot
@@ -42,7 +42,7 @@ jobs:
           command: |
             echo 'export IMAGE_TAG=$(cat version)' >> "$BASH_ENV"
             source "$BASH_ENV"
-            docker build --file Dockerfile.lite --tag $IMAGE_NAME:$IMAGE_TAG-lite .
+            docker build --file ./build/Dockerfile.lite --tag $IMAGE_NAME:$IMAGE_TAG-lite .
   build-bot-lite-arm64:
     environment:
       IMAGE_NAME: eb129/incident-bot
@@ -57,7 +57,7 @@ jobs:
           command: |
             echo 'export IMAGE_TAG=$(cat version)' >> "$BASH_ENV"
             source "$BASH_ENV"
-            docker build --platform linux/arm64 --file Dockerfile.lite.arm64 --tag $IMAGE_NAME:$IMAGE_TAG-lite-arm64 .
+            docker build --platform linux/arm64 --file ./build/Dockerfile.lite.arm64 --tag $IMAGE_NAME:$IMAGE_TAG-lite-arm64 .
   publish-bot:
     environment:
       IMAGE_NAME: eb129/incident-bot
@@ -71,7 +71,7 @@ jobs:
           command: |
             echo 'export IMAGE_TAG=$(cat version)' >> "$BASH_ENV"
             source "$BASH_ENV"
-            docker build --tag $IMAGE_NAME:$IMAGE_TAG .
+            docker build --file ./build/Dockerfile --tag $IMAGE_NAME:$IMAGE_TAG .
             echo "$DOCKERHUB_PASS" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin
             docker push $IMAGE_NAME:$IMAGE_TAG
   publish-bot-arm64:
@@ -88,7 +88,7 @@ jobs:
           command: |
             echo 'export IMAGE_TAG=$(cat version)' >> "$BASH_ENV"
             source "$BASH_ENV"
-            docker build --platform linux/arm64 --file Dockerfile.arm64 --tag $IMAGE_NAME:$IMAGE_TAG-arm64 .
+            docker build --platform linux/arm64 --file ./build/Dockerfile.arm64 --tag $IMAGE_NAME:$IMAGE_TAG-arm64 .
             echo "$DOCKERHUB_PASS" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin
             docker push $IMAGE_NAME:$IMAGE_TAG-arm64
   publish-bot-lite:
@@ -104,7 +104,7 @@ jobs:
           command: |
             echo 'export IMAGE_TAG=$(cat version)' >> "$BASH_ENV"
             source "$BASH_ENV"
-            docker build  --file Dockerfile.lite --tag $IMAGE_NAME:$IMAGE_TAG-lite .
+            docker build  --file ./build/Dockerfile.lite --tag $IMAGE_NAME:$IMAGE_TAG-lite .
             echo "$DOCKERHUB_PASS" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin
             docker push $IMAGE_NAME:$IMAGE_TAG-lite
   publish-bot-lite-arm64:
@@ -121,7 +121,7 @@ jobs:
           command: |
             echo 'export IMAGE_TAG=$(cat version)' >> "$BASH_ENV"
             source "$BASH_ENV"
-            docker build --platform linux/arm64 --file Dockerfile.lite.arm64 --tag $IMAGE_NAME:$IMAGE_TAG-lite-arm64 .
+            docker build --platform linux/arm64 --file ./build/Dockerfile.lite.arm64 --tag $IMAGE_NAME:$IMAGE_TAG-lite-arm64 .
             echo "$DOCKERHUB_PASS" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin
             docker push $IMAGE_NAME:$IMAGE_TAG-lite-arm64
   publish-docs:

diff --git a/backend/config.py b/backend/config.py
@@ -9,7 +9,7 @@
 from iblog import logger, log_level
 from typing import Dict, List
 
-__version__ = "v1.7.4"
+__version__ = "v1.7.6"
 
 # .env parse
 dotenv_path = os.path.join(os.path.dirname(__file__), ".env")

diff --git a/Dockerfile → build/Dockerfile b/Dockerfile → build/Dockerfile
diff --git a/Dockerfile.arm64 → build/Dockerfile.arm64 b/Dockerfile.arm64 → build/Dockerfile.arm64
diff --git a/Dockerfile.lite → build/Dockerfile.lite b/Dockerfile.lite → build/Dockerfile.lite
diff --git a/Dockerfile.lite.arm64 → build/Dockerfile.lite.arm64 b/Dockerfile.lite.arm64 → build/Dockerfile.lite.arm64
diff --git a/deploy/kustomize/incident-bot/overlays/production/kustomization.yaml b/deploy/kustomize/incident-bot/overlays/production/kustomization.yaml
@@ -7,7 +7,7 @@ bases:
 
 images:
   - name: eb129/incident-bot
-    newTag: v1.7.4
+    newTag: v1.7.6
 
 configMapGenerator:
   - name: incident-bot-config

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,7 +3,7 @@ services:
   bot:
     build:
       context: .
-      dockerfile: Dockerfile
+      dockerfile: build/Dockerfile
     command: ['./wait-for-it.sh', 'db:5432', '--', 'python3', 'main.py']
     depends_on:
       - db

diff --git a/docs/deploy/overlays/production/kustomization.yaml b/docs/deploy/overlays/production/kustomization.yaml
@@ -7,7 +7,7 @@ bases:
 
 images:
   - name: eb129/incident-bot-docs
-    newTag: v1.7.4
+    newTag: v1.7.6
 
 generatorOptions:
   disableNameSuffixHash: true
diff --git a/version b/version
@@ -1 +1 @@
-v1.7.4
+v1.7.6