diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 7313c56..4009bb5 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -40,9 +40,12 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Set branch name as release version - id: get_tag - run: echo "RELEASE_VERSION=${GITHUB_REF##refs/heads/}" | sed 's/\//-/g' >> $GITHUB_ENV + - name: Set environment variables + run: | + echo "DOCKERHUB_REPO=${{ secrets.DOCKERHUB_REPO }}" >> $GITHUB_ENV + echo "DOCKERHUB_IMG=${{ secrets.DOCKERHUB_IMG }}" >> $GITHUB_ENV + echo "HUGGINGFACE_ACCESS_TOKEN=${{ secrets.HUGGINGFACE_ACCESS_TOKEN }}" >> $GITHUB_ENV + echo "RELEASE_VERSION=${GITHUB_REF##refs/heads/}" | sed 's/\//-/g' >> $GITHUB_ENV - name: Build and push the images uses: docker/bake-action@v2 @@ -50,10 +53,14 @@ jobs: push: true targets: sd3 set: | - base.args.DOCKERHUB_REPO=${{ secrets.DOCKERHUB_REPO }} - base.args.DOCKERHUB_IMG=${{ secrets.DOCKERHUB_IMG }} + base.args.DOCKERHUB_REPO=${{ env.DOCKERHUB_REPO }} + base.args.DOCKERHUB_IMG=${{ env.DOCKERHUB_IMG }} base.args.RELEASE_VERSION=${{ env.RELEASE_VERSION }} - sd3.args.HUGGINGFACE_ACCESS_TOKEN=${{ secrets.HUGGINGFACE_ACCESS_TOKEN }} - sd3.args.DOCKERHUB_REPO=${{ secrets.DOCKERHUB_REPO }} - sd3.args.DOCKERHUB_IMG=${{ secrets.DOCKERHUB_IMG }} + sdxl.args.DOCKERHUB_REPO=${{ env.DOCKERHUB_REPO }} + sdxl.args.DOCKERHUB_IMG=${{ env.DOCKERHUB_IMG }} + sdxl.args.RELEASE_VERSION=${{ env.RELEASE_VERSION }} + sd3.args.HUGGINGFACE_ACCESS_TOKEN=${{ env.HUGGINGFACE_ACCESS_TOKEN }} + sd3.args.DOCKERHUB_REPO=${{ env.DOCKERHUB_REPO }} + sd3.args.DOCKERHUB_IMG=${{ env.DOCKERHUB_IMG }} sd3.args.RELEASE_VERSION=${{ env.RELEASE_VERSION }} + sd3.tags=${{ env.DOCKERHUB_REPO }}/${{ env.DOCKERHUB_IMG }}:${{ env.RELEASE_VERSION }}-sd3