From 73b2e445b4f3eb32792da1afca0e92e844958b95 Mon Sep 17 00:00:00 2001 From: Juraj Kubrican Date: Mon, 28 Jul 2025 14:29:50 +0200 Subject: [PATCH] update deps + update build script --- .github/workflows/docker-build-self.yml | 42 +++++++++++++------------ go.mod | 6 ++-- go.sum | 6 ++++ 3 files changed, 31 insertions(+), 23 deletions(-) diff --git a/.github/workflows/docker-build-self.yml b/.github/workflows/docker-build-self.yml index 92e1923..e27be98 100644 --- a/.github/workflows/docker-build-self.yml +++ b/.github/workflows/docker-build-self.yml @@ -4,55 +4,57 @@ on: push: branches: - main - # - test jobs: build-and-push: runs-on: self-hosted + env: + IMAGE_NAME: ${{ github.event.repository.name }} + PORT: 54321 + TEST_PORT: 54322 steps: - name: Checkout code uses: actions/checkout@v2 - - name: Write build number - run: echo "${{ github.run_number }}" >> build_number - - name: Build Docker image run: | - IMAGE_NAME="go-web-server" docker build -t "$IMAGE_NAME:latest" -t "$IMAGE_NAME:${{ github.run_number }}" . - name: Ensure no existing temp container run: | - if [ "$(docker ps -aq -f name=temp-go-web-server)" ]; then - docker stop temp-go-web-server || true - docker rm temp-go-web-server || true + if [ "$(docker ps -aq -f name=temp-$IMAGE_NAME)" ]; then + docker stop temp-$IMAGE_NAME || true + docker rm temp-$IMAGE_NAME || true fi - name: Run temporary container for health check run: | - docker run -d --name temp-go-web-server -p 54322:54321 go-web-server:latest + docker run -d --name temp-$IMAGE_NAME -p $TEST_PORT:54321 $IMAGE_NAME:latest sleep 10 # Wait for the container to start - if curl -f http://localhost:54322/health; then + if curl -f http://localhost:$TEST_PORT/health; then echo "Health check passed" - docker stop temp-go-web-server - docker rm temp-go-web-server + docker stop temp-$IMAGE_NAME + docker rm temp-$IMAGE_NAME else echo "Health check failed" - docker logs temp-go-web-server - docker stop temp-go-web-server - docker rm temp-go-web-server + docker logs temp-$IMAGE_NAME + docker stop temp-$IMAGE_NAME + docker rm temp-$IMAGE_NAME exit 1 fi - name: Stop and remove current container run: | - if [ "$(docker ps -q -f name=go-web-server)" ]; then - docker stop go-web-server || true - docker rm go-web-server || true + if [ "$(docker ps -q -f name=$IMAGE_NAME)" ]; then + docker stop $IMAGE_NAME || true + docker rm $IMAGE_NAME || true fi - name: Run new container run: | - IMAGE_NAME="go-web-server" - docker run -d --name go-web-server -p 54321:54321 --restart=always -v "/volume2/docker/knet/data:/app/data" "$IMAGE_NAME:latest" + docker run -d --name $IMAGE_NAME -p $PORT:54321 --restart=always -v "/volume2/docker/$IMAGE_NAME/data:/app/data" "$IMAGE_NAME:latest" + + - name: Cleanup + run: | + docker image prune -a -f --filter="label=$IMAGE_NAME" diff --git a/go.mod b/go.mod index 250f2c6..ca94426 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/labstack/echo/v4 v4.13.4 github.com/labstack/gommon v0.4.2 golang.org/x/net v0.42.0 - modernc.org/sqlite v1.38.0 + modernc.org/sqlite v1.38.1 ) require ( @@ -19,11 +19,11 @@ require ( github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasttemplate v1.2.2 // indirect golang.org/x/crypto v0.40.0 // indirect - golang.org/x/exp v0.0.0-20250711185948-6ae5c78190dc // indirect + golang.org/x/exp v0.0.0-20250718183923-645b1fa84792 // indirect golang.org/x/sys v0.34.0 // indirect golang.org/x/text v0.27.0 // indirect golang.org/x/time v0.12.0 // indirect - modernc.org/libc v1.66.3 // indirect + modernc.org/libc v1.66.6 // indirect modernc.org/mathutil v1.7.1 // indirect modernc.org/memory v1.11.0 // indirect ) diff --git a/go.sum b/go.sum index c6d477c..28ad6fa 100644 --- a/go.sum +++ b/go.sum @@ -43,6 +43,8 @@ golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 h1:R84qjqJb5nVJMxqWYb3np9L5Z golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0/go.mod h1:S9Xr4PYopiDyqSyp5NjCrhFrqg6A5zA2E/iPHPhqnS8= golang.org/x/exp v0.0.0-20250711185948-6ae5c78190dc h1:TS73t7x3KarrNd5qAipmspBDS1rkMcgVG/fS1aRb4Rc= golang.org/x/exp v0.0.0-20250711185948-6ae5c78190dc/go.mod h1:A+z0yzpGtvnG90cToK5n2tu8UJVP2XUATh+r+sfOOOc= +golang.org/x/exp v0.0.0-20250718183923-645b1fa84792 h1:R9PFI6EUdfVKgwKjZef7QIwGcBKu86OEFpJ9nUEP2l4= +golang.org/x/exp v0.0.0-20250718183923-645b1fa84792/go.mod h1:A+z0yzpGtvnG90cToK5n2tu8UJVP2XUATh+r+sfOOOc= golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM= golang.org/x/mod v0.23.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU= @@ -103,6 +105,8 @@ modernc.org/libc v1.63.0 h1:wKzb61wOGCzgahQBORb1b0dZonh8Ufzl/7r4Yf1D5YA= modernc.org/libc v1.63.0/go.mod h1:wDzH1mgz1wUIEwottFt++POjGRO9sgyQKrpXaz3x89E= modernc.org/libc v1.66.3 h1:cfCbjTUcdsKyyZZfEUKfoHcP3S0Wkvz3jgSzByEWVCQ= modernc.org/libc v1.66.3/go.mod h1:XD9zO8kt59cANKvHPXpx7yS2ELPheAey0vjIuZOhOU8= +modernc.org/libc v1.66.6 h1:RyQpwAhM/19nXD8y3iejM/AjmKwY2TjxZTlUWTsWw2U= +modernc.org/libc v1.66.6/go.mod h1:j8z0EYAuumoMQ3+cWXtmw6m+LYn3qm8dcZDFtFTSq+M= modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU= modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg= modernc.org/memory v1.8.2 h1:cL9L4bcoAObu4NkxOlKWBWtNHIsnnACGF/TbqQ6sbcI= @@ -125,6 +129,8 @@ modernc.org/sqlite v1.37.0 h1:s1TMe7T3Q3ovQiK2Ouz4Jwh7dw4ZDqbebSDTlSJdfjI= modernc.org/sqlite v1.37.0/go.mod h1:5YiWv+YviqGMuGw4V+PNplcyaJ5v+vQd7TQOgkACoJM= modernc.org/sqlite v1.38.0 h1:+4OrfPQ8pxHKuWG4md1JpR/EYAh3Md7TdejuuzE7EUI= modernc.org/sqlite v1.38.0/go.mod h1:1Bj+yES4SVvBZ4cBOpVZ6QgesMCKpJZDq0nxYzOpmNE= +modernc.org/sqlite v1.38.1 h1:jNnIjleVta+DKSAr3TnkKK87EEhjPhBLzi6hvIX9Bas= +modernc.org/sqlite v1.38.1/go.mod h1:cPTJYSlgg3Sfg046yBShXENNtPrWrDX8bsbAQBzgQ5E= modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0= modernc.org/strutil v1.2.1/go.mod h1:EHkiggD70koQxjVdSBM3JKM7k6L0FbGE5eymy9i3B9A= modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=