Skip to content

Commit c08e767

Browse files
AetherinoxAetherinox
committed
ci: update workflows
1 parent bb29377 commit c08e767

File tree

2 files changed

+30
-27
lines changed

2 files changed

+30
-27
lines changed

‎.github/workflows/deploy-docker-dockerhub.yml

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,13 @@ on:
5757
inputs:
5858

5959
# #
60-
# Dockerhub › Release Name
60+
# Dockerhub › Image Name
6161
#
6262
# name of release; ubuntu, alpine, etc
6363
# #
6464

6565
IMAGE_NAME:
66-
description: '📦 Release Name'
66+
description: '📦 Image Name'
6767
required: true
6868
default: 'ubuntu'
6969
type: string
@@ -72,7 +72,7 @@ on:
7272
# Dockerhub › Distro Name
7373
#
7474
# used in github image path
75-
# ghcr.io/${{ env.IMAGE_GHCR_AUTHOR }}/${{ env.IMAGE_DISTRO }}
75+
# ghcr.io/${{ env.IMAGE_DOCKERHUB_AUTHOR }}/${{ env.IMAGE_DISTRO }}
7676
# #
7777

7878
IMAGE_DISTRO:
@@ -366,7 +366,7 @@ jobs:
366366
with:
367367
tag: "${{ env.IMAGE_VERSION }}"
368368
tag_exists_error: false
369-
message: '${{ env.IMAGE_DISTRO }}-${{ env.IMAGE_VERSION }}'
369+
message: '${{ env.IMAGE_NAME }}:${{ env.IMAGE_DISTRO }}-${{ env.IMAGE_VERSION }}'
370370
gpg_private_key: ${{ secrets.ADMINSERV_GPG_KEY_ASC }}
371371
gpg_passphrase: ${{ secrets.ADMINSERV_GPG_PASSPHRASE }}
372372

@@ -512,7 +512,7 @@ jobs:
512512

513513
- name: '🕛 Set Vars'
514514
run: |
515-
echo "REGISTRY_REPO_ORG_AUTHOR_LC=`echo ${{ env.IMAGE_DOCKERHUB_AUTHOR }}/${{ env.IMAGE_DISTRO }} | tr '[:upper:]' '[:lower:]'`" >> ${GITHUB_ENV} # aetherinox/docker-base-ubuntu
515+
echo "REGISTRY_REPO_ORG_AUTHOR_LC=`echo ${{ env.IMAGE_DOCKERHUB_AUTHOR }}/${{ env.IMAGE_NAME }} | tr '[:upper:]' '[:lower:]'`" >> ${GITHUB_ENV} # aetherinox/docker-base-ubuntu
516516
echo "REGISTRY_REPO_AUTHOR_LC=`echo ${{ env.IMAGE_DOCKERHUB_AUTHOR }} | tr '[:upper:]' '[:lower:]'`" >> ${GITHUB_ENV} # aetherinox
517517
518518
# #
@@ -629,11 +629,14 @@ jobs:
629629
# tag add noble,jammy,etc ( dispatch only + no dev )
630630
type=raw,enable=${{ github.event_name == 'workflow_dispatch' && inputs.DEV_RELEASE == false }},priority=400,prefix=,suffix=,value=${{ env.IMAGE_DISTRO }}
631631
632-
# tag add development ( dispatch only + only dev )
633-
type=raw,enable=${{ github.event_name == 'workflow_dispatch' && inputs.DEV_RELEASE == true }},priority=300,prefix=,suffix=,value=development
632+
# tag add noble-20250127 ( dispatch only + no dev )
633+
type=raw,enable=${{ github.event_name == 'workflow_dispatch' && inputs.DEV_RELEASE == false }},priority=400,prefix=,suffix=,value=${{ env.IMAGE_DISTRO }}-${{ env.NOW_DOCKER }}
634634
635-
# tag add development ( amd64 + only dev )
636-
type=raw,enable=${{ inputs.DEV_RELEASE }},priority=400,prefix=,suffix=,value=development
635+
# tag add noble-development ( dispatch only + only dev )
636+
type=raw,enable=${{ github.event_name == 'workflow_dispatch' && inputs.DEV_RELEASE == true }},priority=300,prefix=,suffix=,value=${{ env.IMAGE_DISTRO }}-development
637+
638+
# tag add noble-development ( distro + only dev )
639+
type=raw,enable=${{ inputs.DEV_RELEASE }},priority=400,prefix=,suffix=,value=${{ env.IMAGE_DISTRO }}-development
637640
flavor: |
638641
latest=false
639642
labels: |
@@ -867,8 +870,8 @@ jobs:
867870
echo "inputs.IMAGE_NAME ........................ ${{ inputs.IMAGE_NAME }}"
868871
echo "inputs.IMAGE_DISTRO ...................... ${{ inputs.IMAGE_DISTRO }}"
869872
echo "inputs.IMAGE_VERSION ..................... ${{ inputs.IMAGE_VERSION }}"
870-
echo "inputs.IMAGE_DOCKERHUB_AUTHOR ............ ${{ inputs.IMAGE_DOCKERHUB_AUTHOR }}"
871-
echo "inputs.IMAGE_DOCKERHUB_USERNAME .......... ${{ inputs.IMAGE_DOCKERHUB_USERNAME }}"
873+
echo "inputs.IMAGE_GHCR_AUTHOR ................. ${{ inputs.IMAGE_DOCKERHUB_AUTHOR }}"
874+
echo "inputs.IMAGE_GHCR_USERNAME ............... ${{ inputs.IMAGE_DOCKERHUB_USERNAME }}"
872875
echo "inputs.DEV_RELEASE ....................... ${{ inputs.DEV_RELEASE }}"
873876
echo "inputs.DRY_RUN ........................... ${{ inputs.DRY_RUN }}"
874877
echo "‎"
@@ -879,8 +882,8 @@ jobs:
879882
echo "env.IMAGE_VERSION ........................ ${{ env.IMAGE_VERSION }}"
880883
echo "env.PKG_VER_1DIGIT ....................... ${{ env.PKG_VER_1DIGIT }}"
881884
echo "env.PKG_VER_2DIGIT ....................... ${{ env.PKG_VER_2DIGIT }}"
882-
echo "env.IMAGE_DOCKERHUB_AUTHOR ............... ${{ env.IMAGE_DOCKERHUB_AUTHOR }}"
883-
echo "env.IMAGE_DOCKERHUB_USERNAME ............. ${{ env.IMAGE_DOCKERHUB_USERNAME }}"
885+
echo "env.IMAGE_GHCR_AUTHOR .................... ${{ env.IMAGE_DOCKERHUB_AUTHOR }}"
886+
echo "env.IMAGE_GHCR_USERNAME .................. ${{ env.IMAGE_DOCKERHUB_USERNAME }}"
884887
echo "env.NOW .................................. ${{ env.NOW }}"
885888
echo "env.NOW_SHORT ............................ ${{ env.NOW_SHORT }}"
886889
echo "env.NOW_LONG ............................. ${{ env.NOW_LONG }}"
@@ -952,11 +955,11 @@ jobs:
952955
embed-url: "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
953956
embed-thumbnail-url: ${{ env.DISCORD_BOT_EMBED_THUMBNAIL }}
954957
embed-description: |
955-
### 📦 ᲼Deploy (${{ env.IMAGE_REGISTRY }}) ᲼${{ job.status == 'success' && '✅' || '❌' }}᲼ › `${{ env.IMAGE_DISTRO }}-${{ env.IMAGE_VERSION }}${{ inputs.DEV_RELEASE == true && '-development' || '' }}`
958+
### 📦 ᲼Deploy (${{ env.IMAGE_REGISTRY }}) ᲼${{ job.status == 'success' && '✅' || '❌' }}᲼ › `${{ env.IMAGE_NAME }}:${{ env.IMAGE_DISTRO }}-${{ env.IMAGE_VERSION }}${{ inputs.DEV_RELEASE == true && '-development' || '' }}`
956959
${{ inputs.DEV_RELEASE == true && '### ⚠️⚠️ Development / Pre-release ⚠️⚠️' || '' }}
957960
958-
A new version of the docker container `${{ env.IMAGE_DISTRO }}` has been released from Github to ${{ env.IMAGE_REGISTRY }}. The image is available at:
959-
- https://hub.docker.com/r/${{ env.IMAGE_DOCKERHUB_USERNAME }}/${{ env.IMAGE_DISTRO }}
961+
A new version of the docker container `${{ env.IMAGE_NAME }}:${{ env.IMAGE_DISTRO }}-${{ env.IMAGE_VERSION }}` has been released from Github to ${{ env.IMAGE_REGISTRY }}. The image is available at:
962+
- https://hub.docker.com/r/${{ env.IMAGE_DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}
960963
961964
- Version: `${{ env.IMAGE_VERSION }}`
962965
- Release Type: `${{ inputs.DEV_RELEASE == true && '⚠️⚠️ Development / Pre-release ⚠️⚠️' || 'Stable' }}`

‎.github/workflows/deploy-docker-github.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,13 @@ on:
5757
inputs:
5858

5959
# #
60-
# Github › Release Name
60+
# Github › Image Name
6161
#
6262
# name of release; ubuntu, alpine, etc
6363
# #
6464

6565
IMAGE_NAME:
66-
description: '📦 Release Name'
66+
description: '📦 Image Name'
6767
required: true
6868
default: 'ubuntu'
6969
type: string
@@ -371,7 +371,7 @@ jobs:
371371
with:
372372
tag: "${{ env.IMAGE_VERSION }}"
373373
tag_exists_error: false
374-
message: '${{ env.IMAGE_NAME }}-${{ env.IMAGE_DISTRO }}:${{ env.IMAGE_VERSION }}'
374+
message: '${{ env.IMAGE_NAME }}:${{ env.IMAGE_DISTRO }}-${{ env.IMAGE_VERSION }}'
375375
gpg_private_key: ${{ secrets.ADMINSERV_GPG_KEY_ASC }}
376376
gpg_passphrase: ${{ secrets.ADMINSERV_GPG_PASSPHRASE }}
377377

@@ -453,10 +453,10 @@ jobs:
453453
echo "minor=${minor}" >> $GITHUB_OUTPUT
454454
echo "patch=${patch}" >> $GITHUB_OUTPUT
455455
456-
PKG_VER_1DIGIT="$(echo ${{ env.IMAGE_VERSION }} | cut -d '.' -f1-1)" # 3.22 > 3
456+
PKG_VER_1DIGIT="$(echo ${{ env.IMAGE_VERSION }} | cut -d '.' -f1-1)" # 24.04 > 24
457457
echo "PKG_VER_1DIGIT=${PKG_VER_1DIGIT}" >> $GITHUB_ENV
458458
459-
PKG_VER_2DIGIT="$(echo ${{ env.IMAGE_VERSION }} | cut -f2 -d ":" | cut -c1-4)" # 3.22 > 3.2
459+
PKG_VER_2DIGIT="$(echo ${{ env.IMAGE_VERSION }} | cut -f2 -d ":" | cut -c1-4)" # 24.04 > 24.0
460460
echo "PKG_VER_2DIGIT=${PKG_VER_2DIGIT}" >> $GITHUB_ENV
461461
462462
echo "―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――"
@@ -644,11 +644,11 @@ jobs:
644644
# tag add noble-20250127 ( dispatch only + no dev )
645645
type=raw,enable=${{ github.event_name == 'workflow_dispatch' && inputs.DEV_RELEASE == false }},priority=400,prefix=,suffix=,value=${{ env.IMAGE_DISTRO }}-${{ env.NOW_DOCKER }}
646646
647-
# tag add development ( dispatch only + only dev )
648-
type=raw,enable=${{ github.event_name == 'workflow_dispatch' && inputs.DEV_RELEASE == true }},priority=300,prefix=,suffix=,value=development
647+
# tag add noble-development ( dispatch only + only dev )
648+
type=raw,enable=${{ github.event_name == 'workflow_dispatch' && inputs.DEV_RELEASE == true }},priority=300,prefix=,suffix=,value=${{ env.IMAGE_DISTRO }}-development
649649
650-
# tag add development ( amd64 + only dev )
651-
type=raw,enable=${{ inputs.DEV_RELEASE }},priority=400,prefix=,suffix=,value=development
650+
# tag add noble-development ( distro + only dev )
651+
type=raw,enable=${{ inputs.DEV_RELEASE }},priority=400,prefix=,suffix=,value=${{ env.IMAGE_DISTRO }}-development
652652
flavor: |
653653
latest=false
654654
labels: |
@@ -967,10 +967,10 @@ jobs:
967967
embed-url: "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
968968
embed-thumbnail-url: ${{ env.DISCORD_BOT_EMBED_THUMBNAIL }}
969969
embed-description: |
970-
### 📦 ᲼Deploy (${{ env.IMAGE_REGISTRY }}) ᲼${{ job.status == 'success' && '✅' || '❌' }}᲼ › `${{ env.IMAGE_NAME }}-${{ env.IMAGE_DISTRO }}:${{ env.IMAGE_VERSION }}${{ inputs.DEV_RELEASE == true && '-development' || '' }}`
970+
### 📦 ᲼Deploy (${{ env.IMAGE_REGISTRY }}) ᲼${{ job.status == 'success' && '✅' || '❌' }}᲼ › `${{ env.IMAGE_NAME }}:${{ env.IMAGE_DISTRO }}-${{ env.IMAGE_VERSION }}${{ inputs.DEV_RELEASE == true && '-development' || '' }}`
971971
${{ inputs.DEV_RELEASE == true && '### ⚠️⚠️ Development / Pre-release ⚠️⚠️' || '' }}
972972
973-
A new version of the docker container `${{ env.IMAGE_NAME }}-${{ env.IMAGE_DISTRO }}` has been released from Github to ${{ env.IMAGE_REGISTRY }} GHCR. The image is available at:
973+
A new version of the docker container `${{ env.IMAGE_NAME }}:${{ env.IMAGE_DISTRO }}-${{ env.IMAGE_VERSION }}` has been released from Github to ${{ env.IMAGE_REGISTRY }} GHCR. The image is available at:
974974
- https://github.com/${{ github.repository }}/pkgs/container/${{ env.IMAGE_NAME }}
975975
976976
- Version: `${{ env.IMAGE_VERSION }}`

0 commit comments

Comments
 (0)