@@ -38,18 +38,25 @@ jobs:
38
38
39
39
outputs :
40
40
build_number : ${{ steps.short_sha.outputs.value }}
41
- version : ${{ steps.version.outputs.value }}
41
+ new_version : ${{ steps.new_version.outputs.value }}
42
+ old_version : ${{ steps.old_version.outputs.value }}
42
43
43
44
steps :
44
45
- name : Version
45
- id : version
46
+ id : new_version
46
47
run : echo ::set-output name=value::${GITHUB_REF#refs/*/}
47
48
48
49
- uses : actions/checkout@v3
50
+ with :
51
+ fetch-depth : 0
49
52
50
53
- name : Git Short sha
51
54
id : short_sha
52
- run : echo "::set-output name=value::$(git rev-parse --short HEAD)"
55
+ run : echo ::set-output name=value::$(git rev-parse --short HEAD)
56
+
57
+ - name : Extract original version
58
+ id : old_version
59
+ run : echo ::set-output name=value::$(git tag | grep ${{ steps.short_sha.outputs.value }} | sed -r 's|([0-9].[0-9].[0-9]).*|\1|g')
53
60
54
61
55
62
docker-tag :
63
70
- name : Configure AWS credentials
64
71
uses : aws-actions/configure-aws-credentials@v1
65
72
with :
66
- aws-access-key-id : ${{ secrets.AWS_ECR_ACCESSKEYID }}
67
- aws-secret-access-key : ${{ secrets.AWS_ECR_SECRETACCESSKEY }}
73
+ role-to-assume : ${{ secrets.AWS_ECR_ROLE_ARN }}
68
74
aws-region : ${{ secrets.AWS_ECR_REGION }}
69
75
70
76
- name : Login to Amazon ECR
79
85
80
86
- name : Docker tag and push
81
87
env :
82
- SOURCE : ${{ steps.ecr.outputs.registry }}/${{ env.DOCKER_REPOSITORY }}:${{ needs.prepare.outputs.version }}.${{ needs.prepare.outputs.build_number }}
83
- DESTINATION_ECR : ${{ steps.ecr.outputs.registry }}/${{ env.DOCKER_REPOSITORY }}:${{ needs.prepare.outputs.version }}
84
- DESTINATION_DOCKERHUB : ${{ env.DOCKERHUB_REGISTRY }}/${{ env.DOCKER_REPOSITORY }}:${{ needs.prepare.outputs.version }}
88
+ SOURCE : ${{ env.DOCKERHUB_REGISTRY }}/${{ env.DOCKER_REPOSITORY }}:${{ needs.prepare.outputs.old_version }}.${{ needs.prepare.outputs.build_number }}
89
+ DESTINATION_ECR : ${{ steps.ecr.outputs.registry }}/${{ env.DOCKER_REPOSITORY }}:${{ needs.prepare.outputs.new_version }}
90
+ DESTINATION_DOCKERHUB : ${{ env.DOCKERHUB_REGISTRY }}/${{ env.DOCKER_REPOSITORY }}:${{ needs.prepare.outputs.new_version }}
85
91
run : |
86
92
docker pull $SOURCE
87
93
docker tag $SOURCE $DESTINATION_ECR
@@ -109,13 +115,11 @@ jobs:
109
115
token : ${{ secrets.ACCESS_TOKEN }}
110
116
111
117
- name : Update aws-marketplace
112
- env :
113
- VERSION : ${{ needs.prepare.outputs.version }}
114
- run : echo ${{ env.VERSION }} > ${{ env.COMPONENT }}
118
+ run : echo ${{ needs.prepare.outputs.new_version }} > ${{ env.COMPONENT }}
115
119
116
120
- name : Commit and push image update into manifests repo
117
121
env :
118
- VERSION : ${{ needs.prepare.outputs.version }}
122
+ VERSION : ${{ needs.prepare.outputs.new_version }}
119
123
run : |
120
124
git config user.email "azory@ydata.ai"
121
125
git config user.name "Azory YData Bot"
0 commit comments