apextoaster
/
onnx-web
1
0
Fork 0
Code Actions

fix(build): add base OS to image tags

This commit is contained in:
Sean Sube 2023-01-06 13:44:30 -06:00
parent a7a44560db
commit 11e61d0415
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@ -100,24 +100,28 @@ package-api-oci-alpine:
extends: extends:
- .package-api-oci - .package-api-oci
variables: variables:
IMAGE_ARCH: alpine
IMAGE_FILE: Containerfile.alpine IMAGE_FILE: Containerfile.alpine
package-api-oci-buster: package-api-oci-buster:
extends: extends:
- .package-api-oci - .package-api-oci
variables: variables:
IMAGE_ARCH: buster
IMAGE_FILE: Containerfile.buster IMAGE_FILE: Containerfile.buster
package-gui-oci-alpine: package-gui-oci-alpine:
extends: extends:
- .package-gui-oci - .package-gui-oci
variables: variables:
IMAGE_ARCH: alpine
IMAGE_FILE: Containerfile.alpine IMAGE_FILE: Containerfile.alpine
package-gui-oci-buster: package-gui-oci-buster:
extends: extends:
- .package-gui-oci - .package-gui-oci
variables: variables:
IMAGE_ARCH: buster
IMAGE_FILE: Containerfile.buster IMAGE_FILE: Containerfile.buster
package-api-twine: package-api-twine:

3
common/scripts/image-build.sh
View File

@ -3,9 +3,8 @@
IMAGE_PUSH="${1:---skip}" IMAGE_PUSH="${1:---skip}"
IMAGE_NAME="${CI_PROJECT_PATH}-${IMAGE_SUFFIX}" IMAGE_NAME="${CI_PROJECT_PATH}-${IMAGE_SUFFIX}"
IMAGE_TAG="$(echo "${CI_COMMIT_TAG:-${CI_COMMIT_REF_SLUG}}" | sed -r 's/[^-_a-zA-Z0-9\\.]/-/g')" IMAGE_TAG="${IMAGE_ARCH}-$(echo "${CI_COMMIT_TAG:-${CI_COMMIT_REF_SLUG}}" | sed -r 's/[^-_a-zA-Z0-9\\.]/-/g')"
IMAGE_SHORT="${IMAGE_NAME}:${IMAGE_TAG}"
IMAGE_FULL="${IMAGE_NAME}:${IMAGE_TAG}" IMAGE_FULL="${IMAGE_NAME}:${IMAGE_TAG}"
echo "Loading last image: ${IMAGE_FULL}" echo "Loading last image: ${IMAGE_FULL}"