parent
fd8b07b0d8
commit
d81cdfe789
@ -71,8 +71,19 @@ jobs:
|
|||||||
|
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
run: |
|
run: |
|
||||||
docker buildx create --use --name builder --driver docker-container
|
# Check if buildx is available
|
||||||
|
if docker buildx version >/dev/null 2>&1; then
|
||||||
|
echo "Docker Buildx is available"
|
||||||
|
# Create builder if it doesn't exist
|
||||||
|
if ! docker buildx ls | grep -q "builder"; then
|
||||||
|
docker buildx create --name builder --driver docker-container
|
||||||
|
fi
|
||||||
|
# Use the builder
|
||||||
|
docker buildx use builder
|
||||||
docker buildx inspect --bootstrap
|
docker buildx inspect --bootstrap
|
||||||
|
else
|
||||||
|
echo "Docker Buildx not available, using regular docker build"
|
||||||
|
fi
|
||||||
|
|
||||||
- name: Install Bun
|
- name: Install Bun
|
||||||
run: |
|
run: |
|
||||||
@ -208,6 +219,8 @@ jobs:
|
|||||||
- name: Build Docker (admin)
|
- name: Build Docker (admin)
|
||||||
if: env.BUILD_TARGET == 'admin' || env.BUILD_TARGET == 'both'
|
if: env.BUILD_TARGET == 'admin' || env.BUILD_TARGET == 'both'
|
||||||
run: |
|
run: |
|
||||||
|
if docker buildx version >/dev/null 2>&1; then
|
||||||
|
echo "Using Docker Buildx with cache"
|
||||||
docker buildx build \
|
docker buildx build \
|
||||||
--platform linux/amd64 \
|
--platform linux/amd64 \
|
||||||
--cache-from type=registry,ref=${{ env.DOCKER_REGISTRY }}/ppanel/ppanel-admin-web:cache \
|
--cache-from type=registry,ref=${{ env.DOCKER_REGISTRY }}/ppanel/ppanel-admin-web:cache \
|
||||||
@ -215,10 +228,17 @@ jobs:
|
|||||||
-f ./docker/ppanel-admin-web/Dockerfile \
|
-f ./docker/ppanel-admin-web/Dockerfile \
|
||||||
-t ${{ env.DOCKER_REGISTRY }}/ppanel/ppanel-admin-web:${{ env.VERSION }} \
|
-t ${{ env.DOCKER_REGISTRY }}/ppanel/ppanel-admin-web:${{ env.VERSION }} \
|
||||||
--push .
|
--push .
|
||||||
|
else
|
||||||
|
echo "Using regular Docker build"
|
||||||
|
docker build -f ./docker/ppanel-admin-web/Dockerfile -t ${{ env.DOCKER_REGISTRY }}/ppanel/ppanel-admin-web:${{ env.VERSION }} .
|
||||||
|
docker push ${{ env.DOCKER_REGISTRY }}/ppanel/ppanel-admin-web:${{ env.VERSION }}
|
||||||
|
fi
|
||||||
|
|
||||||
- name: Build Docker (user)
|
- name: Build Docker (user)
|
||||||
if: env.BUILD_TARGET == 'user' || env.BUILD_TARGET == 'both'
|
if: env.BUILD_TARGET == 'user' || env.BUILD_TARGET == 'both'
|
||||||
run: |
|
run: |
|
||||||
|
if docker buildx version >/dev/null 2>&1; then
|
||||||
|
echo "Using Docker Buildx with cache"
|
||||||
docker buildx build \
|
docker buildx build \
|
||||||
--platform linux/amd64 \
|
--platform linux/amd64 \
|
||||||
--cache-from type=registry,ref=${{ env.DOCKER_REGISTRY }}/ppanel/ppanel-user-web:cache \
|
--cache-from type=registry,ref=${{ env.DOCKER_REGISTRY }}/ppanel/ppanel-user-web:cache \
|
||||||
@ -226,6 +246,11 @@ jobs:
|
|||||||
-f ./docker/ppanel-user-web/Dockerfile \
|
-f ./docker/ppanel-user-web/Dockerfile \
|
||||||
-t ${{ env.DOCKER_REGISTRY }}/ppanel/ppanel-user-web:${{ env.VERSION }} \
|
-t ${{ env.DOCKER_REGISTRY }}/ppanel/ppanel-user-web:${{ env.VERSION }} \
|
||||||
--push .
|
--push .
|
||||||
|
else
|
||||||
|
echo "Using regular Docker build"
|
||||||
|
docker build -f ./docker/ppanel-user-web/Dockerfile -t ${{ env.DOCKER_REGISTRY }}/ppanel/ppanel-user-web:${{ env.VERSION }} .
|
||||||
|
docker push ${{ env.DOCKER_REGISTRY }}/ppanel/ppanel-user-web:${{ env.VERSION }}
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user