From 57698eca18621e9ed9ea6172d97081202570de57 Mon Sep 17 00:00:00 2001 From: ztimson Date: Thu, 17 Apr 2025 11:36:23 -0400 Subject: [PATCH] Actions: formatting --- .github/workflows/build.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5a3eaed..30daf65 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,10 +12,9 @@ jobs: steps: - name: Build Container run: | - REGISTRY="$(echo "${{github.server_url}}" | sed -E 's|https?://||')" - DOCKER_HUB=$([ -n "${{secrets.DOCKER_HUB_USER}}" ] && [ -n "${{secrets.DOCKER_HUB_TOKEN}}" ] && [ -n "${{secrets.DOCKER_HUB_IMAGE}}" ] && echo "true" || echo "false") - git clone -b "${{github.ref_name}}" "$(echo ${{github.server_url}}/${{github.repository}}.git | sed s%://%://${{github.token}}@% )" . + DOCKER_HUB=$([ -n "${{secrets.DOCKER_HUB_USER}}" ] && [ -n "${{secrets.DOCKER_HUB_TOKEN}}" ] && [ -n "${{secrets.DOCKER_HUB_IMAGE}}" ] && echo "true" || echo "false") + REGISTRY="$(echo "${{github.server_url}}" | sed -E 's|https?://||')" VERSION="$(cat package.json | grep 'version' | grep -Eo '([0-9]+\.?)+(-[0-9a-zA-Z\-\.]+)?')" docker login -u "${{github.repository_owner}}" -p "${{secrets.DEPLOY_TOKEN}}" "$REGISTRY" @@ -30,8 +29,7 @@ jobs: if [ "${{github.ref_name}}" = "master" ]; then docker tag "$REGISTRY/${{github.repository}}:${{github.ref_name}}" "$REGISTRY/${{github.repository}}:$VERSION" - docker push "$REGISTRY/${{github.repository}}:$VERSION" - + docker push "$REGISTRY/${{github.repository}}:$VERSION if [ "$DOCKER_HUB" = "true" ]; then docker tag "$REGISTRY/${{github.repository}}:${{github.ref_name}}" "docker.io/${{secrets.DOCKER_HUB_IMAGE}}:$VERSION" docker push "docker.io/${{secrets.DOCKER_HUB_IMAGE}}:$VERSION" @@ -39,7 +37,6 @@ jobs: docker tag "$REGISTRY/${{github.repository}}:${{github.ref_name}}" "$REGISTRY/${{github.repository}}:latest" docker push "$REGISTRY/${{github.repository}}:latest" - if [ "$DOCKER_HUB" = "true" ]; then docker tag "$REGISTRY/${{github.repository}}:${{github.ref_name}}" "docker.io/${{secrets.DOCKER_HUB_IMAGE}}:latest" docker push "docker.io/${{secrets.DOCKER_HUB_IMAGE}}:latest"