austnv/remnawave-minishop
1
0
Fork 0
Code Issues 1 Pull Requests Activity

fix(ci): use configured Docker Hub namespace

Browse Source
This commit is contained in:
BADtochka
2026-06-09 14:27:04 +03:00
parent 234fc69505
commit ca88c995b8
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/_docker-build-push.yml
+17 -6
View File
@@ -88,19 +88,30 @@ jobs:
username: ${{ secrets.DOCKERHUB_USERNAME }} username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }} password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Resolve image namespace - name: Resolve image namespaces
id: image_namespace id: image_namespaces
env:
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
run: | run: |
owner="${{ github.repository_owner }}" github_owner="${{ github.repository_owner }}"
echo "owner=${owner,,}" >> "$GITHUB_OUTPUT" echo "github_owner=${github_owner,,}" >> "$GITHUB_OUTPUT"
dockerhub_owner="${github_owner,,}"
if [ "${{ inputs.publish_dockerhub }}" = "true" ]; then
if [ -z "$DOCKERHUB_USERNAME" ]; then
echo "::error::DOCKERHUB_USERNAME secret is required for Docker Hub publishing"
exit 1
fi
dockerhub_owner="${DOCKERHUB_USERNAME,,}"
fi
echo "dockerhub_owner=$dockerhub_owner" >> "$GITHUB_OUTPUT"
- name: Docker metadata - name: Docker metadata
id: meta id: meta
uses: docker/metadata-action@v5 uses: docker/metadata-action@v5
with: with:
images: | images: |
name=${{ steps.image_namespace.outputs.owner }}/${{ matrix.image }},enable=${{ inputs.publish_dockerhub }} name=${{ steps.image_namespaces.outputs.dockerhub_owner }}/${{ matrix.image }},enable=${{ inputs.publish_dockerhub }}
name=ghcr.io/${{ steps.image_namespace.outputs.owner }}/${{ matrix.image }},enable=true name=ghcr.io/${{ steps.image_namespaces.outputs.github_owner }}/${{ matrix.image }},enable=true
tags: | tags: |
type=raw,value=dev,enable=${{ inputs.tag_mode == 'dev' }} type=raw,value=dev,enable=${{ inputs.tag_mode == 'dev' }}
type=raw,value=latest,enable=${{ inputs.tag_mode == 'release' }} type=raw,value=latest,enable=${{ inputs.tag_mode == 'release' }}
.gitlab-ci.yml
+3 -3
View File
@@ -50,8 +50,8 @@ docker-dev:
--target "$TARGET" \ --target "$TARGET" \
--build-arg "CI_COMMIT_REF_NAME=$CI_COMMIT_REF_NAME" \ --build-arg "CI_COMMIT_REF_NAME=$CI_COMMIT_REF_NAME" \
--build-arg "BUILDKIT_INLINE_CACHE=1" \ --build-arg "BUILDKIT_INLINE_CACHE=1" \
--cache-from "type=registry,ref=3252a8/$IMAGE:dev" \ --cache-from "type=registry,ref=$DOCKERHUB_USERNAME/$IMAGE:dev" \
--tag "3252a8/$IMAGE:dev" \ --tag "$DOCKERHUB_USERNAME/$IMAGE:dev" \
. .
- git fetch origin dev --tags - git fetch origin dev --tags
- | - |
@@ -59,4 +59,4 @@ docker-dev:
echo "A newer dev commit exists; skipping Docker Hub push for $IMAGE." echo "A newer dev commit exists; skipping Docker Hub push for $IMAGE."
exit 0 exit 0
fi fi
- docker push "3252a8/$IMAGE:dev" - docker push "$DOCKERHUB_USERNAME/$IMAGE:dev"