18 Commits

Author SHA1 Message Date
jcabillot 7342f704b3 Merge pull request 'chore(config): migrate Renovate config' (#13) from renovate/migrate-config into master
Docker Build and Push / lint (push) Successful in 11s
Docker Build and Push / build (push) Successful in 59s
Docker Build and Push / test (push) Successful in 23s
Docker Build and Push / push (push) Successful in 31s
Reviewed-on: #13
2026-06-09 13:32:59 -04:00
renovate 20d77d22de chore(config): migrate config renovate.json
Docker Build and Push / lint (pull_request) Successful in 8s
Docker Build and Push / build (pull_request) Successful in 1m2s
Docker Build and Push / test (pull_request) Successful in 28s
Docker Build and Push / push (pull_request) Has been skipped
2026-06-09 15:30:55 +00:00
jcabillot efa697d122 Merge pull request 'chore: improve renovate dependency detection' (#12) from chore/renovate into master
Docker Build and Push / build (push) Successful in 1m4s
Docker Build and Push / lint (push) Failing after 13m13s
Docker Build and Push / test (push) Has been skipped
Docker Build and Push / push (push) Has been skipped
Reviewed-on: #12
2026-06-09 11:26:57 -04:00
opencodecabilloteu 5d86dd68d5 chore: remove redundant configs now handled globally
Docker Build and Push / lint (pull_request) Successful in 9s
Docker Build and Push / build (pull_request) Successful in 2m30s
Docker Build and Push / test (pull_request) Successful in 25s
Docker Build and Push / push (pull_request) Has been skipped
2026-06-09 13:40:36 +00:00
opencodecabilloteu a8feda02a6 chore: improve renovate dependency detection
Docker Build and Push / lint (pull_request) Successful in 7s
Docker Build and Push / build (pull_request) Failing after 2m8s
Docker Build and Push / test (pull_request) Has been skipped
Docker Build and Push / push (pull_request) Has been skipped
- Disable gitlabci manager (legacy CI, migrated to Gitea Actions)
- Add custom regexManager to detect jcabillot/phpapache base image version from ARG VERSION
2026-06-09 02:20:05 +00:00
jcabillot cdd369630c Merge pull request 'Update hadolint/hadolint-action action to v3.3.0' (#11) from renovate/hadolint-hadolint-action-3.x into master
Docker Build and Push / lint (push) Successful in 12s
Docker Build and Push / build (push) Failing after 2m11s
Docker Build and Push / test (push) Has been skipped
Docker Build and Push / push (push) Has been skipped
Reviewed-on: #11
2026-06-08 15:44:13 -04:00
renovate 11acb639ea Update hadolint/hadolint-action action to v3.3.0
Docker Build and Push / lint (pull_request) Successful in 14s
Docker Build and Push / build (pull_request) Successful in 54s
Docker Build and Push / test (pull_request) Successful in 31s
Docker Build and Push / push (pull_request) Has been skipped
2026-06-08 18:30:21 +00:00
jcabillot 5eef598d4f Merge pull request 'feat: add test' (#10) from feat/test into master
Docker Build and Push / lint (push) Successful in 55s
Docker Build and Push / build (push) Successful in 1m4s
Docker Build and Push / test (push) Successful in 24s
Docker Build and Push / push (push) Successful in 55s
Reviewed-on: #10
2026-06-08 14:22:49 -04:00
opencodecabilloteu 690859448e fix(test): use Docker bridge gateway for DinD networking
Docker Build and Push / lint (pull_request) Successful in 12s
Docker Build and Push / build (pull_request) Successful in 1m9s
Docker Build and Push / test (pull_request) Successful in 29s
Docker Build and Push / push (pull_request) Has been skipped
2026-06-08 18:19:35 +00:00
opencodecabilloteu 9da0efa29c fix(test): use --network=host for Docker-in-Docker compatibility
Docker Build and Push / lint (pull_request) Successful in 1m9s
Docker Build and Push / build (pull_request) Successful in 2m20s
Docker Build and Push / test (pull_request) Failing after 1m41s
Docker Build and Push / push (pull_request) Has been skipped
2026-06-08 17:57:50 +00:00
opencodecabilloteu 268d8d2b62 fix: use container IP instead of port mapping for health check
Docker Build and Push / lint (pull_request) Successful in 13s
Docker Build and Push / build (pull_request) Successful in 1m4s
Docker Build and Push / test (pull_request) Failing after 1h7m58s
Docker Build and Push / push (pull_request) Failing after 14m37s
When running inside Gitea Actions runner (Docker-in-Docker),
127.0.0.1:HOST_PORT doesn't work because the runner container
doesn't have access to the host's port mappings.
Use docker inspect to get the container's direct IP address.
2026-06-08 16:46:13 +00:00
opencodecabilloteu 97ccaee674 fix: sanitize container name in test script
Docker Build and Push / lint (pull_request) Successful in 54s
Docker Build and Push / build (pull_request) Successful in 1m27s
Docker Build and Push / test (pull_request) Failing after 1m37s
Docker Build and Push / push (pull_request) Has been skipped
Replace : and / with - to comply with Docker container naming rules.
The colon in image:tag format is invalid in container names.
2026-06-08 16:33:31 +00:00
opencodecabilloteu e858cb9646 fix: pin actions to SHA and use Gitea-compatible artifact actions
Docker Build and Push / lint (pull_request) Successful in 1m6s
Docker Build and Push / build (pull_request) Successful in 2m19s
Docker Build and Push / test (pull_request) Failing after 23s
Docker Build and Push / push (pull_request) Has been skipped
- Pin all actions to commit SHAs for supply chain security
- Replace actions/upload-artifact@v4 with ChristopherHX/gitea-upload-artifact
- Replace actions/download-artifact@v4 with ChristopherHX/gitea-download-artifact
- These forks work on Gitea Actions (GHES-compatible)
2026-06-08 16:25:59 +00:00
Julien Cabillot d5fc87f67b feat: add integration tests and hadolint to CI pipeline
Docker Build and Push / lint (pull_request) Successful in 19s
Docker Build and Push / build (pull_request) Failing after 40s
Docker Build and Push / test (pull_request) Has been skipped
Docker Build and Push / push (pull_request) Has been skipped
2026-06-08 11:34:24 -04:00
Julien Cabillot d8cc2d80b6 feat: add AGENTS.md 2026-06-08 11:07:14 -04:00
jcabillot e18636904b Merge pull request 'feat: add Gitea Actions workflow' (#9) from feat/gitea-actions into master
Docker Build and Push / build (push) Successful in 2m9s
Reviewed-on: #9
2026-05-29 15:04:52 -04:00
Julien Cabillot af820add1a feat: add Gitea Actions workflow
Docker Build and Push / build (pull_request) Successful in 8m43s
2026-05-29 14:46:20 -04:00
Julien Cabillot c5542d0baf feat: add gitea actions
Docker Build and Push / build (push) Successful in 1m43s
2026-05-29 13:26:42 -04:00
4 changed files with 181 additions and 26 deletions
+62 -26
View File
@@ -2,45 +2,81 @@ name: Docker Build and Push
on: on:
pull_request: pull_request:
branches: [main] branches: [master]
push: push:
branches: [main] branches: [master]
schedule: schedule:
- cron: '0 0 * * *' - cron: '0 0 * * *'
jobs: jobs:
lint:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
- name: Hadolint
uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 # v3.3.0
with:
dockerfile: Dockerfile
build: build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
- name: Set up Docker Buildx - name: Build image
uses: docker/setup-buildx-action@v3 run: docker build -t ci-image:${{ github.sha }} .
- name: Save image
run: docker save -o image.tar ci-image:${{ github.sha }}
- name: Upload artifact
uses: https://github.com/ChristopherHX/gitea-upload-artifact@62ac910c5d3dfa85c7cb2df15afe2e342b2407c2 # main
with:
name: docker-image
path: image.tar
retention-days: 1
test:
runs-on: ubuntu-latest
needs: [lint, build]
steps:
- name: Checkout
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
- name: Download artifact
uses: https://github.com/ChristopherHX/gitea-download-artifact@75635f32b4c1c41c4b3d64e8f85210112ed4c9c7 # main
with:
name: docker-image
- name: Load image
run: docker load < image.tar
- name: Run tests
run: bash tests/test.sh ci-image:${{ github.sha }}
push:
runs-on: ubuntu-latest
needs: test
if: github.event_name != 'pull_request'
steps:
- name: Download artifact
uses: https://github.com/ChristopherHX/gitea-download-artifact@75635f32b4c1c41c4b3d64e8f85210112ed4c9c7 # main
with:
name: docker-image
- name: Load image
run: docker load < image.tar
- name: Login to Docker Hub - name: Login to Docker Hub
if: github.event_name != 'pull_request' uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4
uses: docker/login-action@v3
with: with:
username: ${{ secrets.DOCKERHUB_USERNAME }} username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }} password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Docker metadata - name: Tag and push
id: meta run: |
uses: docker/metadata-action@v6 docker tag ci-image:${{ github.sha }} jcabillot/ip:latest
with: docker push jcabillot/ip:latest
images: jcabillot/ip
tags: |
type=ref,event=branch
type=ref,event=pr
type=sha
type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }}
- name: Build and push
uses: docker/build-push-action@v6
with:
context: .
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
pull: true
+30
View File
@@ -0,0 +1,30 @@
# AGENTS.md
## 1. Overview
Lightweight PHP micro-service that returns the client's public IP address as JSON. Containerized with Docker and deployed on Kubernetes.
## 2. Folder Structure
- `root/`: Application source code served by Apache.
- `index.php`: Single endpoint returning `REMOTE_ADDR` as JSON.
- `.gitea/workflows/`: Gitea Actions CI pipelines.
- `docker-build.yaml`: Build and push Docker image to Docker Hub on push/PR to master + daily cron.
- `Dockerfile`: Multi-stage build extending `jcabillot/phpapache` base image, copies `root/` into `/var/www/html`.
- `.gitlab-ci.yml`: Legacy GitLab CI config (deprecated, replaced by Gitea Actions).
- `Jenkinsfile`: Legacy Jenkins pipeline (deprecated, replaced by Gitea Actions).
## 3. Core Behaviors & Patterns
- **Request/Response Flow**: Single PHP endpoint sets `Content-Type: application/json` header and returns `$_SERVER['REMOTE_ADDR']` encoded as JSON string. No routing, no framework, no state.
- **Container Base Image Pattern**: `Dockerfile` uses `ARG VERSION="latest"` to allow version pinning at build time, extends `jcabillot/phpapache` which provides PHP + Apache pre-configured. Application code is layered on top via `COPY root /var/www/html`.
- **Traefik IngressRoute with HTTPS Redirect**: Two IngressRoute resources handle traffic — `ip-websecure` serves HTTPS on the `websecure` entrypoint, `ip-web` catches HTTP on `web` entrypoint and applies a `redirectScheme` middleware for permanent HTTPS redirect. The Service reference in the HTTP IngressRoute is required by Traefik even though the middleware intercepts before reaching it.
- **Health Probes**: Deployment defines both `livenessProbe` and `readinessProbe` using `httpGet` on `/` at the named `http` port (8080). Kubernetes uses these to restart unhealthy pods and exclude unready pods from the Service endpoints.
- **Security Hardening**: Pod spec sets `automountServiceAccountToken: false` to prevent unnecessary Kubernetes API access from the container.
## 4. Conventions
- **Kubernetes Labels**: Pods use `app: "front"` for Service selector matching and `owner: "jcabillot"` for resource attribution. Deployment-level labels use `app: "front"`.
- **Named Ports**: Container port is named `http` (8080) and referenced by name in probes and Service targetPort, avoiding hardcoded port numbers.
- **Docker Image Tagging**: CI uses `docker/metadata-action` to generate tags — `latest` for master branch pushes, branch/PR/SHA tags for other events. Push is skipped on pull requests.
- **CI Secrets**: Docker Hub credentials are stored as Gitea Actions secrets (`DOCKERHUB_USERNAME`, `DOCKERHUB_TOKEN`), never hardcoded.
+17
View File
@@ -0,0 +1,17 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"customManagers": [
{
"customType": "regex",
"description": "Detect ARG VERSION pin for jcabillot/phpapache base image",
"managerFilePatterns": [
"/^Dockerfile$/"
],
"matchStrings": [
"ARG\\s+VERSION=\"(?<currentValue>[^\"]+)\""
],
"depNameTemplate": "jcabillot/phpapache",
"datasourceTemplate": "docker"
}
]
}
Executable
+72
View File
@@ -0,0 +1,72 @@
#!/usr/bin/env bash
set -euo pipefail
IMAGE="${1:?Usage: test.sh <image>}"
CONTAINER_NAME="test-$(echo "$IMAGE" | tr ':/' '-')-$$"
PASSED=0
FAILED=0
TOTAL=0
cleanup() {
docker rm -f "$CONTAINER_NAME" >/dev/null 2>&1 || true
}
trap cleanup EXIT
assert() {
local name="$1" expected="$2" actual="$3"
TOTAL=$((TOTAL + 1))
if [ "$expected" = "$actual" ]; then
echo " PASS: $name"
PASSED=$((PASSED + 1))
else
echo " FAIL: $name (expected: '$expected', got: '$actual')"
FAILED=$((FAILED + 1))
fi
}
assert_match() {
local name="$1" pattern="$2" actual="$3"
TOTAL=$((TOTAL + 1))
if echo "$actual" | grep -qE "$pattern"; then
echo " PASS: $name"
PASSED=$((PASSED + 1))
else
echo " FAIL: $name (pattern: '$pattern', got: '$actual')"
FAILED=$((FAILED + 1))
fi
}
echo "Running container: $IMAGE"
docker run -d --name "$CONTAINER_NAME" -p 8080:8080 "$IMAGE" >/dev/null
DOCKER_GW=$(docker network inspect bridge --format '{{range .IPAM.Config}}{{.Gateway}}{{end}}')
BASE_URL="http://${DOCKER_GW}:8080"
echo "Waiting for container on ${DOCKER_GW}:8080..."
for i in $(seq 1 30); do
if curl -sf "$BASE_URL/" >/dev/null 2>&1; then
echo "Container ready after ${i}s"
break
fi
if [ "$i" -eq 30 ]; then
echo "FAIL: Container did not become ready within 30s"
docker logs "$CONTAINER_NAME"
exit 1
fi
sleep 1
done
echo ""
echo "Test: GET /"
RESPONSE=$(curl -sf -D - "$BASE_URL/")
STATUS=$(echo "$RESPONSE" | head -1 | grep -oP '\d{3}')
CONTENT_TYPE=$(echo "$RESPONSE" | grep -i 'content-type' | tr -d '\r' | cut -d: -f2- | xargs)
BODY=$(echo "$RESPONSE" | tail -1)
assert "HTTP status is 200" "200" "$STATUS"
assert_match "Content-Type is application/json" "application/json" "$CONTENT_TYPE"
assert_match "Body contains valid IP" '^(\"[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+\"|\"[0-9a-fA-F:]+\")$' "$BODY"
echo ""
echo "Results: $PASSED/$TOTAL passed, $FAILED failed"
[ "$FAILED" -eq 0 ]