fix
Some checks failed
Add-in CI / Build and test Word add-in (push) Failing after 21s
Backend CI + Docker Deploy / Build and test backend (push) Failing after 37s
Web CI / Build and test web app (push) Failing after 5s
Backend CI + Docker Deploy / Build and push backend image (push) Has been skipped
Backend CI + Docker Deploy / Deploy backend container (push) Has been skipped
Some checks failed
Add-in CI / Build and test Word add-in (push) Failing after 21s
Backend CI + Docker Deploy / Build and test backend (push) Failing after 37s
Web CI / Build and test web app (push) Failing after 5s
Backend CI + Docker Deploy / Build and push backend image (push) Has been skipped
Backend CI + Docker Deploy / Deploy backend container (push) Has been skipped
This commit is contained in:
parent
912bf9d0bd
commit
12bb9c9c21
9 changed files with 466 additions and 31 deletions
20
backend/WordVersioning.Api/Dockerfile
Normal file
20
backend/WordVersioning.Api/Dockerfile
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
|
||||
WORKDIR /src
|
||||
|
||||
COPY backend/WordVersioning.Api/WordVersioning.Api.csproj ./backend/WordVersioning.Api/
|
||||
COPY backend/WordVersioning.Api.IntegrationTests/WordVersioning.Api.IntegrationTests.csproj ./backend/WordVersioning.Api.IntegrationTests/
|
||||
COPY backend/WordVersioning.slnx ./backend/
|
||||
|
||||
RUN dotnet restore ./backend/WordVersioning.slnx
|
||||
|
||||
COPY backend ./backend
|
||||
RUN dotnet publish ./backend/WordVersioning.Api/WordVersioning.Api.csproj -c Release -o /app/publish --no-restore
|
||||
|
||||
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS final
|
||||
WORKDIR /app
|
||||
|
||||
ENV ASPNETCORE_URLS=http://+:8080
|
||||
EXPOSE 8080
|
||||
|
||||
COPY --from=build /app/publish .
|
||||
ENTRYPOINT ["dotnet", "WordVersioning.Api.dll"]
|
||||
60
backend/WordVersioning.Api/build-x86.sh
Normal file
60
backend/WordVersioning.Api/build-x86.sh
Normal file
|
|
@ -0,0 +1,60 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Build x86 Docker Image on Apple Silicon
|
||||
# This script builds Docker image for x86/amd64 platform
|
||||
|
||||
set -e # Exit on any error
|
||||
|
||||
echo "🚀 Building x86 Docker image for KML Games..."
|
||||
|
||||
# Configuration
|
||||
IMAGE_NAME="kml-games-admin"
|
||||
TAG="${1:-latest}"
|
||||
PLATFORM="linux/amd64"
|
||||
|
||||
echo "📋 Build Configuration:"
|
||||
echo " Image Name: $IMAGE_NAME"
|
||||
echo " Tag: $TAG"
|
||||
echo " Platform: $PLATFORM"
|
||||
echo ""
|
||||
|
||||
# Check if buildx is available
|
||||
if ! docker buildx version > /dev/null 2>&1; then
|
||||
echo "❌ Docker Buildx is required but not available."
|
||||
echo " Please update Docker Desktop to latest version."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Create builder if not exists
|
||||
BUILDER_NAME="multiarch-builder"
|
||||
if ! docker buildx inspect $BUILDER_NAME > /dev/null 2>&1; then
|
||||
echo "🔧 Creating multiarch builder..."
|
||||
docker buildx create --name $BUILDER_NAME --driver docker-container --bootstrap
|
||||
docker buildx use $BUILDER_NAME
|
||||
else
|
||||
echo "✅ Using existing multiarch builder: $BUILDER_NAME"
|
||||
docker buildx use $BUILDER_NAME
|
||||
fi
|
||||
|
||||
# Build the image for x86 platform
|
||||
echo "🔨 Building Docker image for $PLATFORM..."
|
||||
docker buildx build \
|
||||
--platform $PLATFORM \
|
||||
--tag $IMAGE_NAME:$TAG \
|
||||
--load \
|
||||
.
|
||||
|
||||
echo ""
|
||||
echo "✅ Build completed successfully!"
|
||||
echo "📦 Image: $IMAGE_NAME:$TAG (x86/amd64)"
|
||||
|
||||
# Show image info
|
||||
echo ""
|
||||
echo "🔍 Image Information:"
|
||||
docker image ls | grep $IMAGE_NAME
|
||||
|
||||
echo ""
|
||||
echo "🎉 Ready to use! You can now:"
|
||||
echo " • Run locally: docker run -p 5000:8080 $IMAGE_NAME:$TAG"
|
||||
echo " • Push to registry: docker push your-registry/$IMAGE_NAME:$TAG"
|
||||
echo " • Use in production on x86 servers"
|
||||
104
backend/WordVersioning.Api/dual-tag-push.sh
Normal file
104
backend/WordVersioning.Api/dual-tag-push.sh
Normal file
|
|
@ -0,0 +1,104 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Dual-Tag Harbor Push
|
||||
# Push to IP but tag with domain name for external access
|
||||
|
||||
set -e
|
||||
|
||||
IMAGE_NAME="${1:-kml-games-admin}"
|
||||
TAG="${2:-latest}"
|
||||
HARBOR_IP="192.168.4.11:9088"
|
||||
HARBOR_DOMAIN="docker.code-extreme.dev"
|
||||
PROJECT="kml-games"
|
||||
|
||||
echo "🚀 Dual-Tag Harbor Push (IP + Domain)"
|
||||
echo "===================================="
|
||||
echo " Local Image: $IMAGE_NAME:$TAG"
|
||||
echo " Harbor IP: $HARBOR_IP (for push)"
|
||||
echo " Harbor Domain: $HARBOR_DOMAIN (for external)"
|
||||
echo " Project: $PROJECT"
|
||||
echo ""
|
||||
echo " Internal Path: $HARBOR_IP/$PROJECT/$IMAGE_NAME:$TAG"
|
||||
echo " External Path: $HARBOR_DOMAIN/$PROJECT/$IMAGE_NAME:$TAG"
|
||||
echo ""
|
||||
|
||||
# Check if image exists
|
||||
if ! docker image inspect $IMAGE_NAME:$TAG > /dev/null 2>&1; then
|
||||
echo "❌ Image $IMAGE_NAME:$TAG not found!"
|
||||
echo ""
|
||||
echo "Available images:"
|
||||
docker image ls | grep $IMAGE_NAME || echo "No $IMAGE_NAME images found"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Login to Harbor IP
|
||||
echo "🔐 Logging in to Harbor IP..."
|
||||
if ! docker login $HARBOR_IP; then
|
||||
echo "❌ Login failed!"
|
||||
echo "💡 Please login manually: docker login $HARBOR_IP"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo ""
|
||||
echo "🏷️ Tagging images..."
|
||||
|
||||
# Tag with domain name (for external access)
|
||||
echo " → $HARBOR_DOMAIN/$PROJECT/$IMAGE_NAME:$TAG (external)"
|
||||
docker tag $IMAGE_NAME:$TAG $HARBOR_DOMAIN/$PROJECT/$IMAGE_NAME:$TAG
|
||||
|
||||
# Tag with IP (for push)
|
||||
echo " → $HARBOR_IP/$PROJECT/$IMAGE_NAME:$TAG (push)"
|
||||
docker tag $IMAGE_NAME:$TAG $HARBOR_IP/$PROJECT/$IMAGE_NAME:$TAG
|
||||
|
||||
echo ""
|
||||
echo "📦 Pushing to Harbor via IP..."
|
||||
if docker push $HARBOR_IP/$PROJECT/$IMAGE_NAME:$TAG; then
|
||||
echo ""
|
||||
echo "✅ Push successful!"
|
||||
echo ""
|
||||
echo "🎯 Image Usage:"
|
||||
echo ""
|
||||
echo "📍 Internal Network (same LAN):"
|
||||
echo " docker login $HARBOR_IP"
|
||||
echo " docker pull $HARBOR_IP/$PROJECT/$IMAGE_NAME:$TAG"
|
||||
echo " docker run -p 8080:8080 $HARBOR_IP/$PROJECT/$IMAGE_NAME:$TAG"
|
||||
echo ""
|
||||
echo "🌍 External Network (via domain):"
|
||||
echo " docker login $HARBOR_DOMAIN"
|
||||
echo " docker pull $HARBOR_DOMAIN/$PROJECT/$IMAGE_NAME:$TAG"
|
||||
echo " docker run -p 8080:8080 $HARBOR_DOMAIN/$PROJECT/$IMAGE_NAME:$TAG"
|
||||
echo ""
|
||||
echo "📝 Docker Compose (recommended for external):"
|
||||
echo " services:"
|
||||
echo " app:"
|
||||
echo " image: $HARBOR_DOMAIN/$PROJECT/$IMAGE_NAME:$TAG"
|
||||
echo ""
|
||||
echo "🔍 Harbor Web UI:"
|
||||
echo " URL: http://192.168.4.11:9088/harbor/projects/$PROJECT/repositories"
|
||||
echo ""
|
||||
echo "💡 Both image names point to the same image in Harbor!"
|
||||
else
|
||||
echo ""
|
||||
echo "❌ Push failed!"
|
||||
echo ""
|
||||
echo "🔧 Troubleshooting:"
|
||||
echo " 1. Ensure project '$PROJECT' exists in Harbor"
|
||||
echo " 2. Check Harbor permissions"
|
||||
echo " 3. Verify Harbor connectivity: curl http://192.168.4.11:9088"
|
||||
echo " 4. Create project via Harbor UI: http://192.168.4.11:9088"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Clean up local IP-tagged image (optional)
|
||||
echo ""
|
||||
read -p "🧹 Remove local IP-tagged image? (y/N): " -n 1 -r
|
||||
echo
|
||||
if [[ $REPLY =~ ^[Yy]$ ]]; then
|
||||
docker rmi $HARBOR_IP/$PROJECT/$IMAGE_NAME:$TAG > /dev/null 2>&1 || true
|
||||
echo "✅ Cleaned up local IP-tagged image"
|
||||
fi
|
||||
|
||||
echo ""
|
||||
echo "🎉 Dual-tag push completed!"
|
||||
echo " → Use domain name ($HARBOR_DOMAIN) for external access"
|
||||
echo " → Use IP ($HARBOR_IP) for internal/faster access"
|
||||
Loading…
Add table
Add a link
Reference in a new issue