Merge branch 'hotfix/2.5.4'

project8 · Oct 13, 2023 · e7f1216 · e7f1216
2 parents 1c4ed69 + 72b36b4
commit e7f1216
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -10,9 +10,9 @@ on:
 env:
   REGISTRY: ghcr.io
   BASE_IMG_REPO: project8/kassiopeia_builder
-  BASE_IMG_TAG: v4.0.0
+  BASE_IMG_TAG: v4.0.0-dev
   FINAL_BASE_IMG_REPO: project8/luna_base
-  FINAL_BASE_IMG_TAG: v1.3.3
+  FINAL_BASE_IMG_TAG: v1.3.4
   locust_mc_BUILD_WITH_KASSIOPEIA: ON
   locust_mc_ENABLE_EXECUTABLES: ON
   NARG: 2
@@ -94,7 +94,7 @@ jobs:
           load: true
           build-args: |
             img_repo=${{ env.REGISTRY }}/${{ env.BASE_IMG_REPO }}
-            img_tag=${{ env.BASE_IMG_TAG }}-dev
+            img_tag=${{ env.BASE_IMG_TAG }}
             final_img_repo=${{ env.REGISTRY }}/${{ env.FINAL_BASE_IMG_REPO }}
             final_img_tag=${{ env.FINAL_BASE_IMG_TAG }}${{ matrix.tag-suffix }}
             locust_tag=${{ steps.tag_name.outputs.tag }}
@@ -125,7 +125,7 @@ jobs:
           load: false
           build-args: |
             build_img_repo=${{ env.REGISTRY }}/${{ env.BASE_IMG_REPO }}
-            build_img_tag=${{ env.BASE_IMG_TAG }}-dev
+            build_img_tag=${{ env.BASE_IMG_TAG }}
             final_img_repo=${{ env.REGISTRY }}/${{ env.FINAL_BASE_IMG_REPO }}
             final_img_tag=${{ env.FINAL_BASE_IMG_TAG }}${{ matrix.tag-suffix }}
             locust_tag=${{ steps.tag_name.outputs.tag }}

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 ARG final_img_repo=ghcr.io/project8/luna_base
-ARG final_img_tag=v1.3.3
+ARG final_img_tag=v1.3.4
 
 ARG build_img_repo=ghcr.io/project8/kassiopeia_builder
 ARG build_img_tag=v4.0.0-dev