Compare commits
15 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 0d9b40501b | |||
| ac018747c1 | |||
| 9a2d709318 | |||
| 6a0c4c6496 | |||
| 6ee87ba76d | |||
| 4c7e7fc11e | |||
| 3e253fe591 | |||
| 5038efb420 | |||
| a1830125c1 | |||
|
31b0445939
|
|||
| 90464c7a0a | |||
| 7a6eca5cb5 | |||
| 8789d85dab | |||
|
8e2df90c3b
|
|||
| 028902a42c |
@@ -0,0 +1,75 @@
|
||||
name: Nightly Rebuild
|
||||
|
||||
on:
|
||||
schedule:
|
||||
- cron: '0 0 * * *'
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
|
||||
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
|
||||
|
||||
- name: Build
|
||||
uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0
|
||||
with:
|
||||
context: .
|
||||
push: false
|
||||
load: true
|
||||
tags: ci-image:${{ github.sha }}
|
||||
pull: true
|
||||
|
||||
- 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: build
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
|
||||
|
||||
- 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
|
||||
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
|
||||
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4
|
||||
with:
|
||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||
|
||||
- name: Tag and push
|
||||
run: |
|
||||
docker tag ci-image:${{ github.sha }} jcabillot/tracks:latest
|
||||
docker push jcabillot/tracks:latest
|
||||
@@ -9,38 +9,74 @@ on:
|
||||
- cron: '0 0 * * *'
|
||||
|
||||
jobs:
|
||||
lint:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
|
||||
|
||||
- name: Hadolint
|
||||
uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 # v3.3.0
|
||||
with:
|
||||
dockerfile: Dockerfile
|
||||
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v6
|
||||
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
|
||||
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v4
|
||||
- name: Build image
|
||||
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@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
|
||||
|
||||
- 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
|
||||
if: github.event_name != 'pull_request'
|
||||
uses: docker/login-action@v4
|
||||
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4
|
||||
with:
|
||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||
|
||||
- name: Docker metadata
|
||||
id: meta
|
||||
uses: docker/metadata-action@v6
|
||||
with:
|
||||
images: jcabillot/tracks
|
||||
tags: |
|
||||
#type=ref,event=branch
|
||||
#type=ref,event=pr
|
||||
#type=sha
|
||||
type=raw,value=latest,enable=${{ github.ref == 'refs/heads/master' }}
|
||||
|
||||
- name: Build and push
|
||||
uses: docker/build-push-action@v7
|
||||
with:
|
||||
context: .
|
||||
push: ${{ github.event_name != 'pull_request' }}
|
||||
tags: ${{ steps.meta.outputs.tags }}
|
||||
labels: ${{ steps.meta.outputs.labels }}
|
||||
pull: true
|
||||
- name: Tag and push
|
||||
run: |
|
||||
docker tag ci-image:${{ github.sha }} jcabillot/tracks:latest
|
||||
docker push jcabillot/tracks:latest
|
||||
|
||||
@@ -0,0 +1,84 @@
|
||||
name: Main Branch
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [master]
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
|
||||
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
|
||||
|
||||
- name: Build
|
||||
uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0
|
||||
with:
|
||||
context: .
|
||||
push: false
|
||||
load: true
|
||||
tags: ci-image:${{ github.sha }}
|
||||
pull: true
|
||||
|
||||
- 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: build
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
|
||||
|
||||
- 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
|
||||
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
|
||||
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4
|
||||
with:
|
||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||
|
||||
- name: Tag and push
|
||||
run: |
|
||||
docker tag ci-image:${{ github.sha }} jcabillot/tracks:latest
|
||||
docker push jcabillot/tracks:latest
|
||||
|
||||
- name: Bump version and push tag
|
||||
uses: anothrNick/github-tag-action@4ed44965e0db8dab2b466a16da04aec3cc312fd8 # v1.75.0
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
DEFAULT_BUMP: patch
|
||||
RELEASE_BRANCHES: master
|
||||
WITH_V: true
|
||||
GIT_API_TAGGING: false
|
||||
@@ -0,0 +1,23 @@
|
||||
name: PR Checks
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
branches: [master]
|
||||
|
||||
jobs:
|
||||
hadolint:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
|
||||
- uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 # v3.3.0
|
||||
continue-on-error: true
|
||||
with:
|
||||
dockerfile: Dockerfile
|
||||
|
||||
build-test:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
|
||||
- uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
|
||||
- run: docker build -t ci-image:${{ github.sha }} .
|
||||
- run: bash tests/test.sh ci-image:${{ github.sha }}
|
||||
@@ -0,0 +1,40 @@
|
||||
name: Tag Release
|
||||
|
||||
on:
|
||||
push:
|
||||
tags:
|
||||
- 'v*'
|
||||
|
||||
jobs:
|
||||
build-and-push:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
|
||||
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
|
||||
|
||||
- name: Login to Docker Hub
|
||||
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4
|
||||
with:
|
||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||
|
||||
- name: Docker metadata
|
||||
id: meta
|
||||
uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6
|
||||
with:
|
||||
images: jcabillot/tracks
|
||||
tags: |
|
||||
type=semver,pattern={{version}}
|
||||
type=semver,pattern={{major}}.{{minor}}
|
||||
|
||||
- name: Build and push
|
||||
uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0
|
||||
with:
|
||||
context: .
|
||||
push: true
|
||||
tags: ${{ steps.meta.outputs.tags }}
|
||||
labels: ${{ steps.meta.outputs.labels }}
|
||||
pull: true
|
||||
@@ -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"
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,82 @@
|
||||
#!/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 -e DB_DIR=/tmp "$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/push.php" >/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 /push.php"
|
||||
RESPONSE=$(curl -sf -D - "$BASE_URL/push.php")
|
||||
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 "Body is empty JSON array" "[]" "$BODY"
|
||||
|
||||
echo ""
|
||||
echo "Test: POST /push.php with location data"
|
||||
PAYLOAD='{"_type":"location","tst":1700000000,"lat":45.5,"lon":-73.6,"acc":10}'
|
||||
RESPONSE=$(curl -sf -D - -X POST -H "Content-Type: application/json" -d "$PAYLOAD" "$BASE_URL/push.php")
|
||||
STATUS=$(echo "$RESPONSE" | head -1 | grep -oP '\d{3}')
|
||||
BODY=$(echo "$RESPONSE" | tail -1)
|
||||
|
||||
assert "HTTP status is 200" "200" "$STATUS"
|
||||
assert "Body is empty JSON array" "[]" "$BODY"
|
||||
|
||||
echo ""
|
||||
echo "Results: $PASSED/$TOTAL passed, $FAILED failed"
|
||||
[ "$FAILED" -eq 0 ]
|
||||
Reference in New Issue
Block a user