Skip to content

Commit bbac772

Browse files
authored
Merge pull request #28 from arelange/registry-arm64
fix latest
2 parents 462d8a5 + a42450a commit bbac772

File tree

1 file changed

+19
-25
lines changed

1 file changed

+19
-25
lines changed

.github/workflows/registry-actions.yml

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ jobs:
9494
VERSION="$(yq '.version' rockcraft.yaml)"
9595
ORG_NAME=$(echo "${ORG}" | tr '[:upper:]' '[:lower:]')
9696
GITHUB_IMAGE="ghcr.io/${ORG_NAME}/${IMAGE}"
97-
#DOCKER_MANIFEST=("manifest" "create" "${ORG_NAME}/${IMAGE}:${VERSION}-edge")
98-
GITHUB_MANIFEST=("manifest" "create" "${GITHUB_IMAGE}:${VERSION}-edge")
97+
#declare -a DOCKER_MANIFESTS=()
98+
declare -a GITHUB_MANIFESTS=()
9999
# Upload each rock to the container registry
100100
for rock in *.rock; do
101101
echo "Create container from ${rock}"
@@ -105,31 +105,28 @@ jobs:
105105
# Push to Docker Hub
106106
# docker tag ${ORG_NAME}/${IMAGE}:${VERSION}-${ARCH}-edge ${USERNAME}:${VERSION}-${ARCH}-edge
107107
# docker push ${USERNAME}/${IMAGE}:${VERSION}-${ARCH}-edge
108-
# DOCKER_MANIFEST+=("${ORG_NAME}/${IMAGE}:${VERSION}-${ARCH}-edge")
108+
# DOCKER_MANIFESTS+=("${ORG_NAME}/${IMAGE}:${VERSION}-${ARCH}-edge")
109109
# Push to GitHub Packages
110110
docker tag ${ORG_NAME}/${IMAGE}:${VERSION}-${ARCH}-edge ${GITHUB_IMAGE}:${VERSION}-${ARCH}-edge
111111
docker push ${GITHUB_IMAGE}:${VERSION}-${ARCH}-edge
112-
GITHUB_MANIFEST+=("${GITHUB_IMAGE}:${VERSION}-${ARCH}-edge")
112+
GITHUB_MANIFESTS+=("${GITHUB_IMAGE}:${VERSION}-${ARCH}-edge")
113113
done
114114
115115
# Create and upload a multi-arch manifest for Docker Hub
116-
# echo "create multi-arch container with args: ${DOCKER_MANIFEST[@]}"
117-
# docker "${DOCKER_MANIFEST[@]}"
116+
# echo "create multi-arch container from: ${DOCKER_MANIFESTS[@]}"
117+
# docker manifest create ${ORG_NAME}/${IMAGE}:${VERSION}-edge ${DOCKER_MANIFESTS[@]}
118118
# Push to Docker Hub
119119
# docker tag ${ORG_NAME}/${IMAGE}:${VERSION}-edge ${USERNAME}:${VERSION}-edge
120120
# docker push ${USERNAME}/${IMAGE}:${VERSION}-edge
121121
# docker tag ${USERNAME}/${IMAGE}:${VERSION}-edge ${USERNAME}/${IMAGE}:latest
122122
# docker push ${USERNAME}/${IMAGE}:latest
123123
124124
# Create and upload a multi-arch manifest for Github Packages
125-
echo "create multi-arch container with args: ${GITHUB_MANIFEST[@]}"
126-
docker "${GITHUB_MANIFEST[@]}"
127-
# Push to GitHub Packages
125+
echo "create multi-arch container from: ${GITHUB_MANIFESTS[@]}"
126+
docker manifest create ${GITHUB_IMAGE}:${VERSION}-edge ${GITHUB_MANIFESTS[@]}
128127
docker manifest push ${GITHUB_IMAGE}:${VERSION}-edge
129-
# pulling back the complete image to tag it as latest
130-
docker pull ${GITHUB_IMAGE}:${VERSION}-edge
131-
docker tag ${GITHUB_IMAGE}:${VERSION}-edge ${GITHUB_IMAGE}:latest
132-
docker push ${GITHUB_IMAGE}:latest
128+
docker manifest create ${GITHUB_IMAGE}:latest ${GITHUB_MANIFESTS[@]}
129+
docker manifest push ${GITHUB_IMAGE}:latest
133130
134131
- name: Build and Push Docker Image (Stable Channel)
135132
if: github.event.inputs.workflow_choice == 'stable' || github.event.inputs.workflow_choice == 'both'
@@ -141,8 +138,8 @@ jobs:
141138
VERSION="$(yq '.version' rockcraft.yaml)"
142139
ORG_NAME=$(echo "${ORG}" | tr '[:upper:]' '[:lower:]')
143140
GITHUB_IMAGE="ghcr.io/${ORG_NAME}/${IMAGE}"
144-
#DOCKER_MANIFEST=("manifest" "create" "${ORG_NAME}/${IMAGE}:${VERSION}-stable")
145-
GITHUB_MANIFEST=("manifest" "create" "${GITHUB_IMAGE}:${VERSION}-stable")
141+
#declare -a DOCKER_MANIFESTS=()
142+
declare -a GITHUB_MANIFESTS=()
146143
# Upload each rock to the container registry
147144
for rock in *.rock; do
148145
echo "Create container from ${rock}"
@@ -152,22 +149,19 @@ jobs:
152149
# Push to Docker Hub
153150
# docker tag ${ORG_NAME}/${IMAGE}:${VERSION}-${ARCH}-stable ${USERNAME}:${VERSION}-${ARCH}-stable
154151
# docker push ${USERNAME}/${IMAGE}:${VERSION}-${ARCH}-stable
155-
# DOCKER_MANIFEST+=("${ORG_NAME}/${IMAGE}:${VERSION}-${ARCH}-stable")
152+
# DOCKER_MANIFESTS+=("${ORG_NAME}/${IMAGE}:${VERSION}-${ARCH}-stable")
156153
# Push to GitHub Packages
157154
docker tag ${ORG_NAME}/${IMAGE}:${VERSION}-${ARCH}-stable ${GITHUB_IMAGE}:${VERSION}-${ARCH}-stable
158155
docker push ${GITHUB_IMAGE}:${VERSION}-${ARCH}-stable
159-
GITHUB_MANIFEST+=("${GITHUB_IMAGE}:${VERSION}-${ARCH}-stable")
156+
GITHUB_MANIFESTS+=("${GITHUB_IMAGE}:${VERSION}-${ARCH}-stable")
160157
done
161158
162159
# Create and upload a multi-arch manifest for Docker Hub
163-
# echo "create multi-arch container with args: ${DOCKER_MANIFEST[@]}"
164-
# docker "${DOCKER_MANIFEST[@]}"
165-
# Push to Docker Hub
166-
# docker tag ${ORG_NAME}/${IMAGE}:${VERSION}-stable ${USERNAME}:${VERSION}-stable
167-
# docker push ${USERNAME}/${IMAGE}:${VERSION}-stable
160+
# echo "create multi-arch container from: ${DOCKER_MANIFESTS[@]}"
161+
# docker manifest create ${ORG_NAME}/${IMAGE}:${VERSION}-stable ${DOCKER_MANIFESTS[@]}
162+
# docker manifest push ${ORG_NAME}/${IMAGE}:${VERSION}-stable
168163
169164
# Create and upload a multi-arch manifest for Github Packages
170-
echo "create multi-arch container with args: ${GITHUB_MANIFEST[@]}"
171-
docker "${GITHUB_MANIFEST[@]}"
172-
# Push to GitHub Packages
165+
echo "create multi-arch container from: ${GITHUB_MANIFESTS[@]}"
166+
docker manifest create ${GITHUB_IMAGE}:${VERSION}-stable ${GITHUB_MANIFESTS[@]}
173167
docker manifest push ${GITHUB_IMAGE}:${VERSION}-stable

0 commit comments

Comments
 (0)