refactor(geoip): reconcile geoip system (#31)
This commit is contained in:
hampus-fluxer
GitHub
2
.github/workflows/deploy-api.yaml
vendored
2
.github/workflows/deploy-api.yaml
vendored
@@ -231,8 +231,6 @@ jobs:
|
||||
CLAMAV_HOST=clamav
|
||||
CLAMAV_PORT=3310
|
||||
|
||||
GEOIP_HOST=fluxer-geoip_app:8080
|
||||
GEOIP_PROVIDER=maxmind
|
||||
MAXMIND_DB_PATH=/data/GeoLite2-City.mmdb
|
||||
|
||||
VAPID_PUBLIC_KEY=BEIwQxIwfj6m90tLYAR0AU_GJWU4kw8J_zJcHQG55NCUWSyRy-dzMOgvxk8yEDwdVyJZa6xUL4fmwngijq8T2pY
|
||||
|
||||
124
.github/workflows/deploy-geoip.yaml
vendored
124
.github/workflows/deploy-geoip.yaml
vendored
@@ -1,124 +0,0 @@
|
||||
name: deploy geoip
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
paths:
|
||||
- fluxer_geoip/**
|
||||
- .github/workflows/deploy-geoip.yaml
|
||||
workflow_dispatch: {}
|
||||
|
||||
concurrency:
|
||||
group: deploy-fluxer-geoip
|
||||
cancel-in-progress: true
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
jobs:
|
||||
deploy:
|
||||
name: Deploy geoip
|
||||
runs-on: blacksmith-2vcpu-ubuntu-2404
|
||||
timeout-minutes: 10
|
||||
steps:
|
||||
- uses: actions/checkout@v6
|
||||
|
||||
- name: Record deploy commit
|
||||
run: |
|
||||
set -euo pipefail
|
||||
sha=$(git rev-parse HEAD)
|
||||
echo "Deploying commit ${sha}"
|
||||
printf 'DEPLOY_SHA=%s\n' "$sha" >> "$GITHUB_ENV"
|
||||
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v3
|
||||
|
||||
- name: Login to Docker Hub
|
||||
uses: docker/login-action@v3
|
||||
with:
|
||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||
password: ${{ secrets.DOCKERHUB_PASSWORD }}
|
||||
|
||||
- name: Build image
|
||||
uses: docker/build-push-action@v6
|
||||
with:
|
||||
context: fluxer_geoip
|
||||
file: fluxer_geoip/Dockerfile
|
||||
tags: fluxer-geoip:${{ env.DEPLOY_SHA }}
|
||||
load: true
|
||||
platforms: linux/amd64
|
||||
cache-from: type=gha,scope=deploy-fluxer-geoip
|
||||
cache-to: type=gha,mode=max,scope=deploy-fluxer-geoip
|
||||
env:
|
||||
DOCKER_BUILD_SUMMARY: false
|
||||
DOCKER_BUILD_RECORD_UPLOAD: false
|
||||
|
||||
- name: Install docker-pussh
|
||||
run: |
|
||||
set -euo pipefail
|
||||
mkdir -p ~/.docker/cli-plugins
|
||||
curl -fsSL https://raw.githubusercontent.com/psviderski/unregistry/v0.3.1/docker-pussh \
|
||||
-o ~/.docker/cli-plugins/docker-pussh
|
||||
chmod +x ~/.docker/cli-plugins/docker-pussh
|
||||
|
||||
- name: Set up SSH agent
|
||||
uses: webfactory/ssh-agent@v0.9.1
|
||||
with:
|
||||
ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY_SERVER }}
|
||||
|
||||
- name: Add server to known hosts
|
||||
run: |
|
||||
set -euo pipefail
|
||||
mkdir -p ~/.ssh
|
||||
ssh-keyscan -H ${{ secrets.SERVER_IP }} >> ~/.ssh/known_hosts
|
||||
|
||||
- name: Push image and deploy
|
||||
env:
|
||||
IMAGE_TAG: fluxer-geoip:${{ env.DEPLOY_SHA }}
|
||||
SERVER: ${{ secrets.SERVER_USER }}@${{ secrets.SERVER_IP }}
|
||||
run: |
|
||||
set -euo pipefail
|
||||
docker pussh "${IMAGE_TAG}" "${SERVER}"
|
||||
|
||||
ssh "${SERVER}" "IMAGE_TAG=${IMAGE_TAG} bash" << 'EOF'
|
||||
set -euo pipefail
|
||||
|
||||
sudo mkdir -p /opt/fluxer-geoip
|
||||
sudo chown -R "${USER}:${USER}" /opt/fluxer-geoip
|
||||
cd /opt/fluxer-geoip
|
||||
|
||||
cat > compose.yaml << 'COMPOSEEOF'
|
||||
services:
|
||||
app:
|
||||
image: ${IMAGE_TAG}
|
||||
volumes:
|
||||
- /etc/fluxer/ipinfo_lite.mmdb:/data/ipinfo_lite.mmdb:ro
|
||||
deploy:
|
||||
replicas: 3
|
||||
restart_policy:
|
||||
condition: on-failure
|
||||
delay: 5s
|
||||
max_attempts: 3
|
||||
update_config:
|
||||
parallelism: 1
|
||||
delay: 10s
|
||||
order: start-first
|
||||
rollback_config:
|
||||
parallelism: 1
|
||||
delay: 10s
|
||||
environment:
|
||||
- FLUXER_GEOIP_PORT=8080
|
||||
- GEOIP_DB_PATH=/data/ipinfo_lite.mmdb
|
||||
- GEOIP_CACHE_TTL=10m
|
||||
- GEOIP_CACHE_SIZE=20000
|
||||
networks:
|
||||
- fluxer-shared
|
||||
|
||||
networks:
|
||||
fluxer-shared:
|
||||
external: true
|
||||
COMPOSEEOF
|
||||
|
||||
docker stack deploy --with-registry-auth --detach=false --resolve-image never -c compose.yaml fluxer-geoip
|
||||
EOF
|
||||
1
.github/workflows/deploy-marketing.yaml
vendored
1
.github/workflows/deploy-marketing.yaml
vendored
@@ -160,7 +160,6 @@ jobs:
|
||||
- FLUXER_MARKETING_ENDPOINT=${MARKETING_ENDPOINT}
|
||||
- FLUXER_MARKETING_PORT=8080
|
||||
- FLUXER_PATH_MARKETING=/
|
||||
- GEOIP_HOST=fluxer-geoip_app:8080
|
||||
- RELEASE_CHANNEL=${RELEASE_CHANNEL}
|
||||
- FLUXER_METRICS_HOST=fluxer-metrics_app:8080
|
||||
deploy:
|
||||
|
||||
81
.github/workflows/update-geoip-db.yaml
vendored
81
.github/workflows/update-geoip-db.yaml
vendored
@@ -1,81 +0,0 @@
|
||||
name: update geoip-db
|
||||
|
||||
on:
|
||||
schedule:
|
||||
- cron: '0 0 * * *'
|
||||
workflow_dispatch:
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
concurrency:
|
||||
group: update-geoip-db
|
||||
cancel-in-progress: false
|
||||
|
||||
jobs:
|
||||
refresh-db:
|
||||
runs-on: blacksmith-2vcpu-ubuntu-2404
|
||||
timeout-minutes: 10
|
||||
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v6
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
- name: Set up SSH agent
|
||||
uses: webfactory/ssh-agent@v0.9.1
|
||||
with:
|
||||
ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY_SERVER }}
|
||||
|
||||
- name: Add server to known hosts
|
||||
run: |
|
||||
set -euo pipefail
|
||||
mkdir -p ~/.ssh
|
||||
ssh-keyscan -H ${{ secrets.SERVER_IP }} >> ~/.ssh/known_hosts
|
||||
|
||||
- name: Refresh MMDB on server & roll restart
|
||||
env:
|
||||
SERVER: ${{ secrets.SERVER_USER }}@${{ secrets.SERVER_IP }}
|
||||
IPINFO_TOKEN: ${{ secrets.IPINFO_TOKEN }}
|
||||
run: |
|
||||
set -euo pipefail
|
||||
|
||||
ssh "${SERVER}" bash << EOSSH
|
||||
set -euo pipefail
|
||||
|
||||
if ! command -v curl >/dev/null 2>&1; then
|
||||
sudo apt-get update -y
|
||||
sudo apt-get install -y curl
|
||||
fi
|
||||
|
||||
if ! command -v go >/dev/null 2>&1; then
|
||||
sudo apt-get update -y
|
||||
sudo apt-get install -y golang-go
|
||||
fi
|
||||
|
||||
export PATH="\$PATH:\$(go env GOPATH)/bin"
|
||||
if ! command -v mmdbverify >/dev/null 2>&1; then
|
||||
GOBIN="\$(go env GOPATH)/bin" go install github.com/maxmind/mmdbverify@latest
|
||||
fi
|
||||
|
||||
TMPDIR="\$(mktemp -d)"
|
||||
trap 'rm -rf "\$TMPDIR"' EXIT
|
||||
|
||||
DEST_DIR="/etc/fluxer"
|
||||
DEST_DB="\${DEST_DIR}/ipinfo_lite.mmdb"
|
||||
|
||||
mkdir -p "\$DEST_DIR"
|
||||
|
||||
curl -fsSL -o "\$TMPDIR/ipinfo_lite.mmdb" \
|
||||
"https://ipinfo.io/data/ipinfo_lite.mmdb?token=${IPINFO_TOKEN}"
|
||||
|
||||
[ -s "\$TMPDIR/ipinfo_lite.mmdb" ]
|
||||
|
||||
mmdbverify -file "\$TMPDIR/ipinfo_lite.mmdb"
|
||||
|
||||
install -m 0644 "\$TMPDIR/ipinfo_lite.mmdb" "\$DEST_DB.tmp"
|
||||
mv -f "\$DEST_DB.tmp" "\$DEST_DB"
|
||||
|
||||
docker service update --force fluxer-geoip_app
|
||||
EOSSH
|
||||
Reference in New Issue
Block a user