better tag logic
This commit is contained in:
		
							parent
							
								
									d543b0e2ff
								
							
						
					
					
						commit
						236d40dbee
					
				|  | @ -6,8 +6,11 @@ export DOCKER_ORG="democraticcsi" | ||||||
| export DOCKER_PROJECT="democratic-csi" | export DOCKER_PROJECT="democratic-csi" | ||||||
| export DOCKER_REPO="${DOCKER_ORG}/${DOCKER_PROJECT}" | export DOCKER_REPO="${DOCKER_ORG}/${DOCKER_PROJECT}" | ||||||
| 
 | 
 | ||||||
| export GIT_BRANCH=${GITHUB_REF#refs/heads/} | if [[ $GITHUB_REF == refs/tags/* ]]; then | ||||||
| export GIT_TAG=${GITHUB_TAG} |   export GIT_TAG=${GITHUB_REF#refs/tags/} | ||||||
|  | else | ||||||
|  |   export GIT_BRANCH=${GITHUB_REF#refs/heads/} | ||||||
|  | fi | ||||||
| 
 | 
 | ||||||
| if [[ -n "${GIT_TAG}" ]]; then | if [[ -n "${GIT_TAG}" ]]; then | ||||||
|   docker buildx build --progress plain --pull --push --platform "${DOCKER_BUILD_PLATFORM}" -t ${DOCKER_REPO}:${GIT_TAG} . |   docker buildx build --progress plain --pull --push --platform "${DOCKER_BUILD_PLATFORM}" -t ${DOCKER_REPO}:${GIT_TAG} . | ||||||
|  |  | ||||||
|  | @ -16,7 +16,6 @@ jobs: | ||||||
|       - uses: actions/checkout@v2 |       - uses: actions/checkout@v2 | ||||||
|       - name: docker build |       - name: docker build | ||||||
|         run: | |         run: | | ||||||
|           env |  | ||||||
|           export ARCH=$([ $(uname -m) = "x86_64" ] && echo "amd64" || echo "arm64") |           export ARCH=$([ $(uname -m) = "x86_64" ] && echo "amd64" || echo "arm64") | ||||||
|           mkdir -p ~/.docker/cli-plugins/ |           mkdir -p ~/.docker/cli-plugins/ | ||||||
|           wget -qO ~/.docker/cli-plugins/docker-buildx https://github.com/docker/buildx/releases/download/v0.3.1/buildx-v0.3.1.linux-${ARCH} |           wget -qO ~/.docker/cli-plugins/docker-buildx https://github.com/docker/buildx/releases/download/v0.3.1/buildx-v0.3.1.linux-${ARCH} | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue