Fix change SDK_IMAGE_TAG to IMAGE_TAG (#12)

* Fix change SDK_IMAGE_TAG to IMAGE_TAG * Fix source image tag 8.0.0-preview.2.23153.2-bookworm-slim => 8.0-preview-bookworm-slim * Add branch fix/* * Try re-enable jammy-chiseled * Revert "Try re-enable jammy-chiseled" This reverts commit 18271e4.
NetLah · Mar 16, 2023 · a0ab8a1 · a0ab8a1
1 parent 13081f0
commit a0ab8a1
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -2,7 +2,7 @@ name: Docker Image CI
 
 on:
   push:
-    branches: ["main", "dev*"]
+    branches: ["main", "dev*", "dev/*", "fix*", "fix/*"]
     tags: ["*.*.*"]
 
 jobs:

diff --git a/docker-build.ps1 b/docker-build.ps1
@@ -90,7 +90,7 @@ foreach ($dockerRepos in $dockerRepository) {
 }
 
 $sourceImageTag = $imageTag
-if ($imageTagMajor -match '^8\.0\.0-(preview|rc)') {
+if ($imageTagMajor -match '^8\.0(\.0)?-(preview|rc)') {
     $sourceImageTag = $imageTagMajor
 }
 

diff --git a/src/alpine/Dockerfile b/src/alpine/Dockerfile
@@ -1,5 +1,5 @@
-ARG SDK_IMAGE_TAG=6.0-alpine
-FROM mcr.microsoft.com/dotnet/aspnet:${SDK_IMAGE_TAG} AS base
+ARG IMAGE_TAG=6.0-alpine
+FROM mcr.microsoft.com/dotnet/aspnet:${IMAGE_TAG} AS base
 
 # Sample dotnet Alpine with ICU https://github.com/dotnet/dotnet-docker/blob/main/samples/dotnetapp/Dockerfile.alpine-x64#L20
 ENV SSH_PORT=2222 \

diff --git a/src/debian/Dockerfile b/src/debian/Dockerfile
@@ -1,5 +1,5 @@
-ARG SDK_IMAGE_TAG=6.0-bullseye-slim
-FROM mcr.microsoft.com/dotnet/aspnet:${SDK_IMAGE_TAG} AS base
+ARG IMAGE_TAG=6.0-bullseye-slim
+FROM mcr.microsoft.com/dotnet/aspnet:${IMAGE_TAG} AS base
 
 ENV SSH_PORT=2222 \
     TZ=UTC