Skip to content

Commit 52ee586

Browse files
dogidogi
authored
Merge branch 'master' into perf-optimize-tags-in-selection-5162557332314747528
2 parents 564d906 + b90cfb8 commit 52ee586

318 files changed

Lines changed: 5248 additions & 3386 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.eslintrc.json‎

Lines changed: 32 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"plugins": [
2020
"@typescript-eslint",
2121
"@angular-eslint",
22+
"@stylistic",
2223
"eslint-plugin-import",
2324
"eslint-plugin-jsdoc",
2425
"eslint-plugin-prefer-arrow"
@@ -74,7 +75,7 @@
7475
"@angular-eslint/contextual-lifecycle": "error",
7576
"@angular-eslint/directive-class-suffix": "error",
7677
"@angular-eslint/no-conflicting-lifecycle": "error",
77-
"@angular-eslint/no-host-metadata-property": "error",
78+
// "@angular-eslint/no-host-metadata-property": "error",
7879
"@angular-eslint/no-input-rename": "error",
7980
"@angular-eslint/no-inputs-metadata-property": "error",
8081
"@angular-eslint/no-output-native": "error",
@@ -85,32 +86,7 @@
8586
"@angular-eslint/use-pipe-transform-interface": "error",
8687
"@typescript-eslint/adjacent-overload-signatures": "error",
8788
"@typescript-eslint/array-type": "off",
88-
"@typescript-eslint/ban-types": [
89-
"error",
90-
{
91-
"types": {
92-
"Object": {
93-
"message": "Avoid using the `Object` type. Did you mean `object`?"
94-
},
95-
"Function": {
96-
"message": "Avoid using the `Function` type. Prefer a specific function type, like `() => void`."
97-
},
98-
"Boolean": {
99-
"message": "Avoid using the `Boolean` type. Did you mean `boolean`?"
100-
},
101-
"Number": {
102-
"message": "Avoid using the `Number` type. Did you mean `number`?"
103-
},
104-
"String": {
105-
"message": "Avoid using the `String` type. Did you mean `string`?"
106-
},
107-
"Symbol": {
108-
"message": "Avoid using the `Symbol` type. Did you mean `symbol`?"
109-
}
110-
}
111-
}
112-
],
113-
// "@typescript-eslint/consistent-type-assertions": "error",
89+
"@typescript-eslint/consistent-type-assertions": "error",
11490
// "@typescript-eslint/member-ordering": "error",
11591
// "@typescript-eslint/naming-convention": [
11692
// "error",
@@ -170,6 +146,31 @@
170146
"@typescript-eslint/no-namespace": "error",
171147
"@typescript-eslint/no-non-null-assertion": "error",
172148
"@typescript-eslint/no-parameter-properties": "off",
149+
"@typescript-eslint/no-restricted-types": [
150+
"error",
151+
{
152+
"types": {
153+
"Object": {
154+
"message": "Avoid using the `Object` type. Did you mean `object`?"
155+
},
156+
"Function": {
157+
"message": "Avoid using the `Function` type. Prefer a specific function type, like `() => void`."
158+
},
159+
"Boolean": {
160+
"message": "Avoid using the `Boolean` type. Did you mean `boolean`?"
161+
},
162+
"Number": {
163+
"message": "Avoid using the `Number` type. Did you mean `number`?"
164+
},
165+
"String": {
166+
"message": "Avoid using the `String` type. Did you mean `string`?"
167+
},
168+
"Symbol": {
169+
"message": "Avoid using the `Symbol` type. Did you mean `symbol`?"
170+
}
171+
}
172+
}
173+
],
173174
// "@typescript-eslint/no-unused-expressions": "error",
174175
"@typescript-eslint/no-var-requires": "off",
175176
// "@typescript-eslint/prefer-for-of": "error",
@@ -311,13 +312,13 @@
311312
// }
312313
// ],
313314
"quotes": "off",
314-
"@typescript-eslint/quotes": [
315+
"@stylistic/quotes": [
315316
"error",
316317
"single",
317-
{ "allowTemplateLiterals": true }
318+
{ "allowTemplateLiterals": "never" }
318319
],
319-
// "@typescript-eslint/semi": ["error", "always"],
320-
"@typescript-eslint/type-annotation-spacing": "error"
320+
"@stylistic/semi": ["error", "always"],
321+
"@stylistic/type-annotation-spacing": "error"
321322
}
322323
},
323324
{

‎.github/workflows/planet-chat.yml‎

Lines changed: 26 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,13 @@ jobs:
3939

4040
strategy:
4141
matrix:
42-
arch: [ amd64, arm, arm64 ]
42+
include:
43+
- arch: amd64
44+
base_image: treehouses/node:3.16
45+
- arch: arm
46+
base_image: treehouses/node-tags:arm-3.16
47+
- arch: arm64
48+
base_image: treehouses/node-tags:arm64-3.16
4349

4450
steps:
4551
- name: Checkout Code
@@ -51,10 +57,15 @@ jobs:
5157
- name: Build image
5258
run: |
5359
BRANCH="${GITHUB_REF_NAME//\//-}"
54-
repo="$DOCKER_ORG/$DOCKER_REPO_TAG:${{ matrix.arch }}-chatapi-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
55-
branchrepo="$DOCKER_ORG/$DOCKER_REPO_TAG:${{ matrix.arch }}-chatapi-$PLANET_VERSION-$BRANCH"
60+
BRANCH_HASH="$(printf '%s' "$BRANCH" | sha256sum | cut -c1-8)"
61+
SAFE_BRANCH="${BRANCH:0:75}-$BRANCH_HASH"
62+
repo="$DOCKER_ORG/$DOCKER_REPO_TAG:${{ matrix.arch }}-chatapi-$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
63+
branchrepo="$DOCKER_ORG/$DOCKER_REPO_TAG:${{ matrix.arch }}-chatapi-$PLANET_VERSION-$SAFE_BRANCH"
5664
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
57-
docker build -f './docker/chatapi/${{ matrix.arch }}-Dockerfile' -t $repo .
65+
docker build \
66+
-f './docker/chatapi/Dockerfile' \
67+
--build-arg BASE_IMAGE='${{ matrix.base_image }}' \
68+
-t $repo .
5869
docker images
5970
docker tag $repo $branchrepo
6071
docker push $repo
@@ -74,10 +85,12 @@ jobs:
7485
- name: Multiarch Deploy
7586
run: |
7687
BRANCH="${GITHUB_REF_NAME//\//-}"
77-
manifesttag="$DOCKER_ORG/$DOCKER_REPO_TAG:chatapi-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
78-
amd64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:amd64-chatapi-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
79-
armtag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm-chatapi-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
80-
arm64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm64-chatapi-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
88+
BRANCH_HASH="$(printf '%s' "$BRANCH" | sha256sum | cut -c1-8)"
89+
SAFE_BRANCH="${BRANCH:0:75}-$BRANCH_HASH"
90+
manifesttag="$DOCKER_ORG/$DOCKER_REPO_TAG:chatapi-$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
91+
amd64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:amd64-chatapi-$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
92+
armtag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm-chatapi-$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
93+
arm64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm64-chatapi-$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
8194
docker manifest create $manifesttag $amd64tag $armtag $arm64tag
8295
docker manifest annotate $manifesttag $amd64tag --os linux --arch amd64
8396
docker manifest annotate $manifesttag $armtag --os linux --arch arm
@@ -88,9 +101,11 @@ jobs:
88101
if: ${{ github.event_name == 'release' }}
89102
run: |
90103
BRANCH="${GITHUB_REF_NAME//\//-}"
91-
amd64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:amd64-chatapi-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
92-
armtag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm-chatapi-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
93-
arm64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm64-chatapi-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
104+
BRANCH_HASH="$(printf '%s' "$BRANCH" | sha256sum | cut -c1-8)"
105+
SAFE_BRANCH="${BRANCH:0:75}-$BRANCH_HASH"
106+
amd64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:amd64-chatapi-$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
107+
armtag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm-chatapi-$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
108+
arm64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm64-chatapi-$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
94109
for tag in "$DOCKER_ORG/$DOCKER_REPO:chatapi-$PLANET_VERSION" "$DOCKER_ORG/$DOCKER_REPO:chatapi"; do
95110
docker manifest create $tag $amd64tag $armtag $arm64tag
96111
docker manifest annotate $tag $amd64tag --os linux --arch amd64

‎.github/workflows/planet-db.yml‎

Lines changed: 27 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Planet DB-Init Builder
22

3-
on:
3+
on:
44
push:
55
branches-ignore:
66
- l10n_i18n
@@ -39,7 +39,13 @@ jobs:
3939

4040
strategy:
4141
matrix:
42-
arch: [ amd64, arm, arm64 ]
42+
include:
43+
- arch: amd64
44+
base_image: treehouses/node:3.18
45+
- arch: arm
46+
base_image: treehouses/node-tags:arm-3.18
47+
- arch: arm64
48+
base_image: treehouses/node-tags:arm64-3.18
4349

4450
steps:
4551
- name: Checkout Code
@@ -51,10 +57,15 @@ jobs:
5157
- name: Build image
5258
run: |
5359
BRANCH="${GITHUB_REF_NAME//\//-}"
54-
repo="$DOCKER_ORG/$DOCKER_REPO_TAG:${{ matrix.arch }}-db-init-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
55-
branchrepo="$DOCKER_ORG/$DOCKER_REPO_TAG:${{ matrix.arch }}-db-init-$PLANET_VERSION-$BRANCH"
60+
BRANCH_HASH="$(printf '%s' "$BRANCH" | sha256sum | cut -c1-8)"
61+
SAFE_BRANCH="${BRANCH:0:75}-$BRANCH_HASH"
62+
repo="$DOCKER_ORG/$DOCKER_REPO_TAG:${{ matrix.arch }}-db-init-$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
63+
branchrepo="$DOCKER_ORG/$DOCKER_REPO_TAG:${{ matrix.arch }}-db-init-$PLANET_VERSION-$SAFE_BRANCH"
5664
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
57-
docker build -f './docker/db-init/${{ matrix.arch }}-Dockerfile' -t $repo .
65+
docker build \
66+
-f './docker/db-init/Dockerfile' \
67+
--build-arg BASE_IMAGE='${{ matrix.base_image }}' \
68+
-t $repo .
5869
docker images
5970
docker tag $repo $branchrepo
6071
docker push $repo
@@ -74,10 +85,12 @@ jobs:
7485
- name: Multiarch Deploy
7586
run: |
7687
BRANCH="${GITHUB_REF_NAME//\//-}"
77-
manifesttag="$DOCKER_ORG/$DOCKER_REPO_TAG:db-init-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
78-
amd64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:amd64-db-init-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
79-
armtag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm-db-init-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
80-
arm64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm64-db-init-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
88+
BRANCH_HASH="$(printf '%s' "$BRANCH" | sha256sum | cut -c1-8)"
89+
SAFE_BRANCH="${BRANCH:0:75}-$BRANCH_HASH"
90+
manifesttag="$DOCKER_ORG/$DOCKER_REPO_TAG:db-init-$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
91+
amd64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:amd64-db-init-$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
92+
armtag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm-db-init-$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
93+
arm64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm64-db-init-$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
8194
docker manifest create $manifesttag $amd64tag $armtag $arm64tag
8295
docker manifest annotate $manifesttag $amd64tag --os linux --arch amd64
8396
docker manifest annotate $manifesttag $armtag --os linux --arch arm
@@ -88,9 +101,11 @@ jobs:
88101
if: ${{ github.event_name == 'release' }}
89102
run: |
90103
BRANCH="${GITHUB_REF_NAME//\//-}"
91-
amd64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:amd64-db-init-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
92-
armtag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm-db-init-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
93-
arm64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm64-db-init-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
104+
BRANCH_HASH="$(printf '%s' "$BRANCH" | sha256sum | cut -c1-8)"
105+
SAFE_BRANCH="${BRANCH:0:75}-$BRANCH_HASH"
106+
amd64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:amd64-db-init-$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
107+
armtag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm-db-init-$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
108+
arm64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm64-db-init-$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
94109
for tag in "$DOCKER_ORG/$DOCKER_REPO:db-init-$PLANET_VERSION" "$DOCKER_ORG/$DOCKER_REPO:db-init"; do
95110
docker manifest create $tag $amd64tag $armtag $arm64tag
96111
docker manifest annotate $tag $amd64tag --os linux --arch amd64

‎.github/workflows/planet.yml‎

Lines changed: 40 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,9 @@ jobs:
6565
if: ${{ env.SHOULD_UPDATE_PACKAGES == 1 || github.event.inputs.buildtype == 'prebuild' }}
6666
run: |
6767
BRANCH="${GITHUB_REF_NAME//\//-}"
68-
repo="$DOCKER_ORG/$DOCKER_REPO_PRE:$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
68+
BRANCH_HASH="$(printf '%s' "$BRANCH" | sha256sum | cut -c1-8)"
69+
SAFE_BRANCH="${BRANCH:0:75}-$BRANCH_HASH"
70+
repo="$DOCKER_ORG/$DOCKER_REPO_PRE:$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
6971
mkdir -p ./ng-app/dist
7072
docker build -f './docker/planet/pre-builder-Dockerfile' -t $repo .
7173
docker images
@@ -75,7 +77,9 @@ jobs:
7577
if: ${{ (github.ref == 'refs/heads/master' || env.IS_RELEASE == 'true') && (env.SHOULD_UPDATE_PACKAGES == 1 || github.event.inputs.buildtype == 'prebuild') }}
7678
run: |
7779
BRANCH="${GITHUB_REF_NAME//\//-}"
78-
repo="$DOCKER_ORG/$DOCKER_REPO_PRE:$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
80+
BRANCH_HASH="$(printf '%s' "$BRANCH" | sha256sum | cut -c1-8)"
81+
SAFE_BRANCH="${BRANCH:0:75}-$BRANCH_HASH"
82+
repo="$DOCKER_ORG/$DOCKER_REPO_PRE:$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
7983
latestrepo="$DOCKER_ORG/$DOCKER_REPO_PRE:latest"
8084
docker tag $repo $latestrepo
8185
docker push $latestrepo
@@ -103,16 +107,20 @@ jobs:
103107
continue-on-error: true # If there are no package changes, the commit specific image will not be built so an error is expected here
104108
run: |
105109
BRANCH="${GITHUB_REF_NAME//\//-}"
106-
prerepo="$DOCKER_ORG/$DOCKER_REPO_PRE:$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
110+
BRANCH_HASH="$(printf '%s' "$BRANCH" | sha256sum | cut -c1-8)"
111+
SAFE_BRANCH="${BRANCH:0:75}-$BRANCH_HASH"
112+
prerepo="$DOCKER_ORG/$DOCKER_REPO_PRE:$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
107113
latestprerepo="$DOCKER_ORG/$DOCKER_REPO_PRE:latest"
108114
docker pull $prerepo
109115
docker tag $prerepo $latestprerepo
110116
111117
- name: Build single language build
112118
run: |
113119
BRANCH="${GITHUB_REF_NAME//\//-}"
114-
repo="$DOCKER_ORG/$DOCKER_REPO_LANG:$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
115-
branchrepo="$DOCKER_ORG/$DOCKER_REPO_LANG:$PLANET_VERSION-$BRANCH"
120+
BRANCH_HASH="$(printf '%s' "$BRANCH" | sha256sum | cut -c1-8)"
121+
SAFE_BRANCH="${BRANCH:0:75}-$BRANCH_HASH"
122+
repo="$DOCKER_ORG/$DOCKER_REPO_LANG:$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
123+
branchrepo="$DOCKER_ORG/$DOCKER_REPO_LANG:$PLANET_VERSION-$SAFE_BRANCH"
116124
export NODE_OPTIONS=--max_old_space_size=4096
117125
mkdir -p ./ng-app/dist
118126
docker build -f './docker/planet/builder-Dockerfile' -t $repo .
@@ -132,7 +140,13 @@ jobs:
132140

133141
strategy:
134142
matrix:
135-
arch: [ amd64, arm, arm64 ]
143+
include:
144+
- arch: amd64
145+
base_image: treehouses/nginx
146+
- arch: arm
147+
base_image: treehouses/nginx-tags:arm
148+
- arch: arm64
149+
base_image: treehouses/nginx-tags:arm64
136150

137151
steps:
138152
- name: Checkout Code
@@ -144,12 +158,14 @@ jobs:
144158
- name: Build image
145159
run: |
146160
BRANCH="${GITHUB_REF_NAME//\//-}"
147-
repo="$DOCKER_ORG/$DOCKER_REPO_TAG:${{ matrix.arch }}-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
148-
branchrepo="$DOCKER_ORG/$DOCKER_REPO_TAG:${{ matrix.arch }}-$PLANET_VERSION-$BRANCH"
161+
BRANCH_HASH="$(printf '%s' "$BRANCH" | sha256sum | cut -c1-8)"
162+
SAFE_BRANCH="${BRANCH:0:75}-$BRANCH_HASH"
163+
repo="$DOCKER_ORG/$DOCKER_REPO_TAG:${{ matrix.arch }}-$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
164+
branchrepo="$DOCKER_ORG/$DOCKER_REPO_TAG:${{ matrix.arch }}-$PLANET_VERSION-$SAFE_BRANCH"
149165
LANGUAGES=( 'eng' 'ara' 'fra' 'spa' 'nep' 'som')
150166
mkdir -p ./ng-app/dist
151167
mkdir -p ./ng-app/langbuild
152-
docker create --name langbuild "$DOCKER_ORG/$DOCKER_REPO_LANG:$PLANET_VERSION-$BRANCH"
168+
docker create --name langbuild "$DOCKER_ORG/$DOCKER_REPO_LANG:$PLANET_VERSION-$SAFE_BRANCH"
153169
docker export langbuild > langbuild.tar
154170
tar -xf langbuild.tar -C ./ng-app/langbuild
155171
for LANGUAGE in "${LANGUAGES[@]}"; do
@@ -166,7 +182,10 @@ jobs:
166182
mv ./ng-app/dist/$lang2 ./ng-app/dist/$LANGUAGE
167183
done
168184
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
169-
docker build -f './docker/planet/${{ matrix.arch }}-Dockerfile' -t $repo .
185+
docker build \
186+
-f './docker/planet/Dockerfile' \
187+
--build-arg BASE_IMAGE='${{ matrix.base_image }}' \
188+
-t $repo .
170189
docker images
171190
docker tag $repo $branchrepo
172191
docker push $repo
@@ -187,10 +206,12 @@ jobs:
187206
- name: Multiarch Deploy
188207
run: |
189208
BRANCH="${GITHUB_REF_NAME//\//-}"
190-
manifesttag="$DOCKER_ORG/$DOCKER_REPO_TAG:$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
191-
amd64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:amd64-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
192-
armtag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
193-
arm64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm64-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
209+
BRANCH_HASH="$(printf '%s' "$BRANCH" | sha256sum | cut -c1-8)"
210+
SAFE_BRANCH="${BRANCH:0:75}-$BRANCH_HASH"
211+
manifesttag="$DOCKER_ORG/$DOCKER_REPO_TAG:$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
212+
amd64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:amd64-$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
213+
armtag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm-$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
214+
arm64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm64-$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
194215
docker manifest create $manifesttag $amd64tag $armtag $arm64tag
195216
docker manifest annotate $manifesttag $amd64tag --os linux --arch amd64
196217
docker manifest annotate $manifesttag $armtag --os linux --arch arm
@@ -201,9 +222,11 @@ jobs:
201222
if: ${{ github.event_name == 'release' }}
202223
run: |
203224
BRANCH="${GITHUB_REF_NAME//\//-}"
204-
amd64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:amd64-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
205-
armtag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
206-
arm64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm64-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
225+
BRANCH_HASH="$(printf '%s' "$BRANCH" | sha256sum | cut -c1-8)"
226+
SAFE_BRANCH="${BRANCH:0:75}-$BRANCH_HASH"
227+
amd64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:amd64-$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
228+
armtag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm-$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
229+
arm64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm64-$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
207230
for tag in "$DOCKER_ORG/$DOCKER_REPO:$PLANET_VERSION" "$DOCKER_ORG/$DOCKER_REPO:latest"; do
208231
docker manifest create $tag $amd64tag $armtag $arm64tag
209232
docker manifest annotate $tag $amd64tag --os linux --arch amd64

0 commit comments

Comments
 (0)