extern/workspaces-core-images
1
0
Fork 0
mirror of https://github.com/kasmtech/workspaces-core-images.git synced 2024-11-07 16:14:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/KASM-2010_arm' into 'develop'

Browse Source 
KASM-2010 Reference buildx image via ORG_NAME variable

Closes KASM-2010

See merge request kasm-technologies/internal/workspaces-core-images!25
This commit is contained in:
Justin Travis 2021-10-28 14:30:58 +00:00
commit 2bc24f9422
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.gitlab-ci.yml
View File

@ -17,7 +17,7 @@ before_script:
# Jobs for the develop and release branches. They should push to the private and public repos # Jobs for the develop and release branches. They should push to the private and public repos
build_ubuntu_bionic: build_ubuntu_bionic:
stage: build stage: build
image: kasmweb/docker-buildx-private:develop image: ${ORG_NAME}/docker-buildx-private:develop
variables: variables:
BUILD_PLATFORMS: "linux/amd64,linux/arm64" BUILD_PLATFORMS: "linux/amd64,linux/arm64"
script: script:
@ -96,7 +96,7 @@ build_centos:
# These jobs should run on the feature/bugfix branches - anything that is not the develop or release branches. It should only push images to the private repos # These jobs should run on the feature/bugfix branches - anything that is not the develop or release branches. It should only push images to the private repos
build_ubuntu_bionic_dev: build_ubuntu_bionic_dev:
image: kasmweb/docker-buildx-private:develop image: ${ORG_NAME}/docker-buildx-private:develop
stage: build stage: build
variables: variables:
BUILD_PLATFORMS: "linux/amd64,linux/arm64" BUILD_PLATFORMS: "linux/amd64,linux/arm64"
@ -155,7 +155,7 @@ build_centos_dev:
# These jobs are for the "rolling" release of the images. They should only run for scheduled jobs and should only push the rolling tags # These jobs are for the "rolling" release of the images. They should only run for scheduled jobs and should only push the rolling tags
build_ubuntu_bionic_scheduled: build_ubuntu_bionic_scheduled:
stage: build stage: build
image: kasmweb/docker-buildx-private:develop image: ${ORG_NAME}/docker-buildx-private:develop
variables: variables:
BUILD_PLATFORMS: "linux/amd64,linux/arm64" BUILD_PLATFORMS: "linux/amd64,linux/arm64"
script: script:
@ -216,8 +216,8 @@ update_readmes:
- git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@${README_TEMPLATE_REPO} - git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@${README_TEMPLATE_REPO}
- sed -e "/{about}/r docs/$KASM_IMAGE/README.md" -e "/{about}/d" dockerhub-readme-template/TEMPLATE.md > docs/$KASM_IMAGE/FULL_README.md - sed -e "/{about}/r docs/$KASM_IMAGE/README.md" -e "/{about}/d" dockerhub-readme-template/TEMPLATE.md > docs/$KASM_IMAGE/FULL_README.md
- cat docs/$KASM_IMAGE/FULL_README.md - cat docs/$KASM_IMAGE/FULL_README.md
- docker run -v $PWD:/workspace -e DOCKER_USERNAME="$README_USERNAME" -e DOCKER_PASSWORD="$README_PASSWORD" -e DOCKERHUB_REPOSITORY="${ORG_NAME}/$KASM_IMAGE-private" -e README_FILEPATH="/workspace/docs/$KASM_IMAGE/FULL_README.md" -e DESCRIPTION_FILEPATH="/workspace/docs/$KASM_IMAGE/description.txt" kasmweb/dockerhub-updater:latest - docker run -v $PWD:/workspace -e DOCKER_USERNAME="$README_USERNAME" -e DOCKER_PASSWORD="$README_PASSWORD" -e DOCKERHUB_REPOSITORY="${ORG_NAME}/$KASM_IMAGE-private" -e README_FILEPATH="/workspace/docs/$KASM_IMAGE/FULL_README.md" -e DESCRIPTION_FILEPATH="/workspace/docs/$KASM_IMAGE/description.txt" ${ORG_NAME}/dockerhub-updater:latest
- docker run -v $PWD:/workspace -e DOCKER_USERNAME="$README_USERNAME" -e DOCKER_PASSWORD="$README_PASSWORD" -e DOCKERHUB_REPOSITORY="${ORG_NAME}/$KASM_IMAGE" -e README_FILEPATH="/workspace/docs/$KASM_IMAGE/FULL_README.md" -e DESCRIPTION_FILEPATH="/workspace/docs/$KASM_IMAGE/description.txt" kasmweb/dockerhub-updater:latest - docker run -v $PWD:/workspace -e DOCKER_USERNAME="$README_USERNAME" -e DOCKER_PASSWORD="$README_PASSWORD" -e DOCKERHUB_REPOSITORY="${ORG_NAME}/$KASM_IMAGE" -e README_FILEPATH="/workspace/docs/$KASM_IMAGE/FULL_README.md" -e DESCRIPTION_FILEPATH="/workspace/docs/$KASM_IMAGE/description.txt" ${ORG_NAME}/dockerhub-updater:latest
only: only:
variables: variables: