update again sudo
This commit is contained in:
+10
-21
@@ -68,40 +68,29 @@ jobs:
|
||||
echo "GITEA_LOCAL_IP=$GITEA_LOCAL_IP" >> $GITHUB_ENV
|
||||
echo "Using Gitea at: $GITEA_LOCAL_IP"
|
||||
|
||||
- name: Configure Docker for insecure registry
|
||||
run: |
|
||||
echo "Configuring Docker to allow insecure registry..."
|
||||
REGISTRY="$GITEA_LOCAL_IP:3000"
|
||||
|
||||
# Backup existing daemon.json if it exists
|
||||
sudo cp /etc/docker/daemon.json /etc/docker/daemon.json.bak 2>/dev/null || true
|
||||
|
||||
# Create or update daemon.json to allow insecure registry
|
||||
echo "{\"insecure-registries\":[\"$REGISTRY\"]}" | sudo tee /etc/docker/daemon.json
|
||||
|
||||
# Reload Docker daemon
|
||||
sudo systemctl reload docker
|
||||
sleep 3
|
||||
|
||||
echo "Docker configured for insecure registry: $REGISTRY"
|
||||
|
||||
- name: Login to Gitea registry
|
||||
run: |
|
||||
echo "Logging into Gitea container registry..."
|
||||
export DOCKER_CONFIG=/tmp/docker-config
|
||||
mkdir -p $DOCKER_CONFIG
|
||||
|
||||
# Use local IP for login (now configured as insecure registry)
|
||||
# Use local IP for login - try without insecure flag first
|
||||
REGISTRY="$GITEA_LOCAL_IP:3000"
|
||||
echo "Attempting login to local registry: $REGISTRY"
|
||||
|
||||
# First try normal login
|
||||
echo "${{ secrets.token }}" | docker --config $DOCKER_CONFIG login "$REGISTRY" -u "${{ secrets.username }}" --password-stdin && {
|
||||
echo "REGISTRY_URL=$REGISTRY" >> $GITHUB_ENV
|
||||
echo "✅ Local registry login successful"
|
||||
} || {
|
||||
echo "❌ Local login failed, trying domain name as fallback..."
|
||||
echo "${{ secrets.token }}" | docker --config $DOCKER_CONFIG login gitea.skalas.org -u "${{ secrets.username }}" --password-stdin
|
||||
echo "REGISTRY_URL=gitea.skalas.org" >> $GITHUB_ENV
|
||||
echo "Normal login failed, trying HTTPS domain as fallback..."
|
||||
echo "${{ secrets.token }}" | docker --config $DOCKER_CONFIG login gitea.skalas.org -u "${{ secrets.username }}" --password-stdin && {
|
||||
echo "REGISTRY_URL=gitea.skalas.org" >> $GITHUB_ENV
|
||||
echo "✅ Domain registry login successful"
|
||||
} || {
|
||||
echo "❌ All login attempts failed"
|
||||
exit 1
|
||||
}
|
||||
}
|
||||
|
||||
- name: Push to Gitea registry
|
||||
|
||||
Reference in New Issue
Block a user