commit d4e6ff2d17ddde0d70bcece827ed706b377daab7 · hailey.at/myaur

+10

.dockerignore

···

       1
       1
       +
       .git

     

       2
       2
       +
       .gitignore

     

       3
       3
       +
       Dockerfile

     

       4
       4
       +
       docker-compose.yml

     

       5
       5
       +
       .dockerignore

     

       6
       6
       +
       aur-mirror

     

       7
       7
       +
       myaur.db

     

       8
       8
       +
       *.db

     

       9
       9
       +
       *.db-shm

     

       10
       10
       +
       *.db-wal

+26

Caddyfile

···

       1
       1
       +
       # Replace with your actual domain name

     

       2
       2
       +
       # For local development, you can use localhost

     

       3
       3
       +
       :80 {

     

       4
       4
       +
           # Redirect to HTTPS

     

       5
       5
       +
           redir https://{host}{uri} permanent

     

       6
       6
       +
       }

     

       7
       7
       +
       

     

       8
       8
       +
       # Main application

     

       9
       9
       +
       :443 {

     

       10
       10
       +
           # Automatic HTTPS with self-signed cert (for localhost)

     

       11
       11
       +
           # For production, replace with your domain and Caddy will get a Let's Encrypt cert

     

       12
       12
       +
           # Example: myaur.example.com

     

       13
       13
       +
       

     

       14
       14
       +
           # Reverse proxy to myaur application

     

       15
       15
       +
           reverse_proxy localhost:8080

     

       16
       16
       +
       

     

       17
       17
       +
           # Enable logging

     

       18
       18
       +
           log {

     

       19
       19
       +
               output file /var/log/caddy/access.log

     

       20
       20
       +
           }

     

       21
       21
       +
       }

     

       22
       22
       +
       

     

       23
       23
       +
       # Metrics endpoint (optional - uncomment if you want metrics exposed)

     

       24
       24
       +
       # :8081 {

     

       25
       25
       +
       #     reverse_proxy localhost:8081

     

       26
       26
       +
       # }

+36

Dockerfile

···

       1
       1
       +
       # Build stage

     

       2
       2
       +
       FROM golang:1.25.3-bookworm AS builder

     

       3
       3
       +
       

     

       4
       4
       +
       RUN apt-get update && apt-get install -y \

     

       5
       5
       +
           git \

     

       6
       6
       +
           ca-certificates \

     

       7
       7
       +
           && rm -rf /var/lib/apt/lists/*

     

       8
       8
       +
       

     

       9
       9
       +
       WORKDIR /build

     

       10
       10
       +
       

     

       11
       11
       +
       COPY go.mod go.sum ./

     

       12
       12
       +
       

     

       13
       13
       +
       RUN go mod download

     

       14
       14
       +
       

     

       15
       15
       +
       COPY . .

     

       16
       16
       +
       

     

       17
       17
       +
       RUN CGO_ENABLED=1 go build -o myaur-bin ./cmd/myaur

     

       18
       18
       +
       

     

       19
       19
       +
       # Runtime stage

     

       20
       20
       +
       FROM debian:bookworm-slim

     

       21
       21
       +
       

     

       22
       22
       +
       RUN apt-get update && apt-get install -y \

     

       23
       23
       +
           ca-certificates \

     

       24
       24
       +
           git \

     

       25
       25
       +
           && rm -rf /var/lib/apt/lists/*

     

       26
       26
       +
       

     

       27
       27
       +
       WORKDIR /app

     

       28
       28
       +
       

     

       29
       29
       +
       COPY --from=builder /build/myaur-bin /app/myaur-bin

     

       30
       30
       +
       

     

       31
       31
       +
       RUN mkdir -p /app/data

     

       32
       32
       +
       

     

       33
       33
       +
       EXPOSE 8080 8081

     

       34
       34
       +
       

     

       35
       35
       +
       # Set default command

     

       36
       36
       +
       CMD ["/app/myaur-bin", "serve", "--listen-addr", ":8080", "--metrics-listen-addr", ":8081", "--database-path", "/app/data/myaur.db", "--repo-path", "/app/aur-mirror"]

+1

cmd/myaur/main.go

···

       9
       9
        
       	"github.com/haileyok/myaur/myaur/gitrepo"

     

       10
       10
        
       	"github.com/haileyok/myaur/myaur/populate"

     

       11
       11
        
       	"github.com/haileyok/myaur/myaur/server"

     

       12
       12
       +
       	_ "github.com/joho/godotenv/autoload"

     

       12
       13
        
       	"github.com/urfave/cli/v2"

     

       13
       14
        
       )

     

       14
       15

+31

docker-compose.yml

···

       1
       1
       +
       version: '3.8'

     

       2
       2
       +
       

     

       3
       3
       +
       services:

     

       4
       4
       +
         myaur:

     

       5
       5
       +
           build:

     

       6
       6
       +
             context: .

     

       7
       7
       +
             dockerfile: Dockerfile

     

       8
       8
       +
           container_name: myaur

     

       9
       9
       +
           network_mode: host

     

       10
       10
       +
           volumes:

     

       11
       11
       +
             - myaur-data:/app/data

     

       12
       12
       +
           restart: unless-stopped

     

       13
       13
       +
           environment:

     

       14
       14
       +
             - TZ=UTC

     

       15
       15
       +
       

     

       16
       16
       +
         caddy:

     

       17
       17
       +
           image: caddy:2-alpine

     

       18
       18
       +
           container_name: caddy

     

       19
       19
       +
           network_mode: host

     

       20
       20
       +
           volumes:

     

       21
       21
       +
             - ./Caddyfile:/etc/caddy/Caddyfile

     

       22
       22
       +
             - caddy-data:/data

     

       23
       23
       +
             - caddy-config:/config

     

       24
       24
       +
           restart: unless-stopped

     

       25
       25
       +
           depends_on:

     

       26
       26
       +
             - myaur

     

       27
       27
       +
       

     

       28
       28
       +
       volumes:

     

       29
       29
       +
         myaur-data:

     

       30
       30
       +
         caddy-data:

     

       31
       31
       +
         caddy-config:

+1

go.mod

···

       3
       3
        
       go 1.25.3

     

       4
       4
        
       

     

       5
       5
        
       require (

     

       6
       6
       +
       	github.com/joho/godotenv v1.5.1

     

       6
       7
        
       	github.com/labstack/echo/v4 v4.13.4

     

       7
       8
        
       	github.com/labstack/gommon v0.4.2

     

       8
       9
        
       	github.com/samber/slog-echo v1.18.0

+2

go.sum

···

       8
       8
        
       github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=

     

       9
       9
        
       github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=

     

       10
       10
        
       github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=

     

       11
       11
       +
       github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=

     

       12
       12
       +
       github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=

     

       11
       13
        
       github.com/labstack/echo/v4 v4.13.4 h1:oTZZW+T3s9gAu5L8vmzihV7/lkXGZuITzTQkTEhcXEA=

     

       12
       14
        
       github.com/labstack/echo/v4 v4.13.4/go.mod h1:g63b33BZ5vZzcIUF8AtRH40DrTlXnx4UMC8rBdndmjQ=

     

       13
       15
        
       github.com/labstack/gommon v0.4.2 h1:F8qTUNXgG1+6WQmqoUWnz8WiEU60mXVVw0P4ht1WRA0=

+5 -1

myaur/populate/populate.go

···

       120
       120
        
       			}

     

       121
       121
        
       			processed.Add(1)

     

       122
       122
        
       

     

       123
       123
       -
       			logger.Info("progress", "processed", processed.Load(), "succeeded", succeeded.Load(), "failed", failed.Load(), "total", len(branches))

     

       123
       123
       +
       			processed := processed.Load()

     

       124
       124
       +
       			if processed%500 == 0 {

     

       125
       125
       +
       				logger.Info("progress", "processed", processed, "succeeded", succeeded.Load(), "failed", failed.Load(), "total", len(branches))

     

       126
       126
       +
       			}

     

       127
       127
       +
       			logger.Debug("progress", "processed", processed, "succeeded", succeeded.Load(), "failed", failed.Load(), "total", len(branches))

     

       124
       128
        
       		}()

     

       125
       129
        
       	}

     

       126
       130

+74 -6

myaur/server/server.go

···

       7
       7
        
       	"net/http"

     

       8
       8
        
       	"os"

     

       9
       9
        
       	"os/signal"

     

       10
       10
       +
       	"sync"

     

       10
       11
        
       	"syscall"

     

       11
       12
        
       	"time"

     

       12
       13
        
       

     

       13
       14
        
       	"github.com/haileyok/myaur/myaur/database"

     

       14
       15
        
       	"github.com/haileyok/myaur/myaur/gitrepo"

     

       16
       16
       +
       	"github.com/haileyok/myaur/myaur/populate"

     

       15
       17
        
       	"github.com/labstack/echo/v4"

     

       16
       18
        
       	"github.com/labstack/echo/v4/middleware"

     

       17
       19
        
       	"github.com/labstack/gommon/log"

     
···

       24
       26
        
       	httpd         *http.Server

     

       25
       27
        
       	metricsHttpd  *http.Server

     

       26
       28
        
       	db            *database.Database

     

       29
       29
       +
       	populator     *populate.Populate

     

       27
       30
        
       	remoteRepoUrl string

     

       28
       31
        
       	repoPath      string

     

       29
       32
        
       }

     
···

       73
       76
        
       		return nil, fmt.Errorf("failed to create new database client: %w", err)

     

       74
       77
        
       	}

     

       75
       78
        
       

     

       79
       79
       +
       	populator, err := populate.New(&populate.Args{

     

       80
       80
       +
       		DatabasePath:  args.DatabasePath,

     

       81
       81
       +
       		RepoPath:      args.RepoPath,

     

       82
       82
       +
       		RemoteRepoUrl: args.RemoteRepoUrl,

     

       83
       83
       +
       		Debug:         args.Debug,

     

       84
       84
       +
       		Concurrency:   20, // TODO: make an env-var for this

     

       85
       85
       +
       	})

     

       86
       86
       +
       

     

       76
       87
        
       	s := Server{

     

       77
       88
        
       		echo:          e,

     

       78
       89
        
       		httpd:         &httpd,

     

       79
       90
        
       		metricsHttpd:  &metricsHttpd,

     

       80
       91
        
       		db:            db,

     

       92
       92
       +
       		populator:     populator,

     

       81
       93
        
       		logger:        logger,

     

       82
       94
        
       		remoteRepoUrl: args.RemoteRepoUrl,

     

       83
       95
        
       		repoPath:      args.RepoPath,

     
···

       97
       109
        
       		}()

     

       98
       110
        
       

     

       99
       111
        
       		logger.Info("myaur metrics server listening", "addr", s.metricsHttpd.Addr)

     

       112
       112
       +
       	}()

     

       113
       113
       +
       

     

       114
       114
       +
       	shutdownTicker := make(chan struct{})

     

       115
       115
       +
       	tickerShutdown := make(chan struct{})

     

       116
       116
       +
       	go func() {

     

       117
       117
       +
       		logger := s.logger.With("component", "update-routine")

     

       118
       118
       +
       

     

       119
       119
       +
       		ticker := time.NewTicker(1 * time.Hour)

     

       120
       120
       +
       

     

       121
       121
       +
       		go func() {

     

       122
       122
       +
       			logger.Info("performing initial database population")

     

       123
       123
       +
       

     

       124
       124
       +
       			if err := s.populator.Run(ctx); err != nil {

     

       125
       125
       +
       				logger.Info("error populating", "err", err)

     

       126
       126
       +
       			}

     

       127
       127
       +
       

     

       128
       128
       +
       			for range ticker.C {

     

       129
       129
       +
       				if err := s.populator.Run(ctx); err != nil {

     

       130
       130
       +
       					logger.Info("error populating", "err", err)

     

       131
       131
       +
       				}

     

       132
       132
       +
       			}

     

       133
       133
       +
       

     

       134
       134
       +
       			close(tickerShutdown)

     

       135
       135
       +
       		}()

     

       136
       136
       +
       

     

       137
       137
       +
       		<-shutdownTicker

     

       138
       138
       +
       

     

       139
       139
       +
       		ticker.Stop()

     

       100
       140
        
       	}()

     

       101
       141
        
       

     

       102
       142
        
       	shutdownEcho := make(chan struct{})

     
···

       151
       191
        
       		// echo should have already been closed

     

       152
       192
        
       	}

     

       153
       193
        
       

     

       154
       154
       -
       	select {

     

       155
       155
       -
       	case <-echoShutdown:

     

       156
       156
       -
       		s.logger.Info("echo shutdown gracefully")

     

       157
       157
       -
       	case <-time.After(5 * time.Second):

     

       158
       158
       -
       		s.logger.Warn("echo did not shut down after five seconds. forcefully exiting.")

     

       159
       159
       -
       	}

     

       194
       194
       +
       	close(shutdownTicker)

     

       195
       195
       +
       

     

       196
       196
       +
       	s.logger.Info("send ctrl+c to forcefully shutdown without waiting for routines to finish")

     

       197
       197
       +
       

     

       198
       198
       +
       	forceShutdownSignals := make(chan os.Signal, 1)

     

       199
       199
       +
       	signal.Notify(forceShutdownSignals, syscall.SIGINT, syscall.SIGTERM)

     

       200
       200
       +
       

     

       201
       201
       +
       	var wg sync.WaitGroup

     

       202
       202
       +
       	wg.Go(func() {

     

       203
       203
       +
       		s.logger.Info("waiting up to 5 seconds for echo to shut down")

     

       204
       204
       +
       		select {

     

       205
       205
       +
       		case <-echoShutdown:

     

       206
       206
       +
       			s.logger.Info("echo shutdown gracefully")

     

       207
       207
       +
       		case <-time.After(5 * time.Second):

     

       208
       208
       +
       			s.logger.Warn("echo did not shut down after five seconds. forcefully exiting.")

     

       209
       209
       +
       		case <-forceShutdownSignals:

     

       210
       210
       +
       			s.logger.Warn("received forceful shutdown signal before echo shut down")

     

       211
       211
       +
       		}

     

       212
       212
       +
       	})

     

       213
       213
       +
       

     

       214
       214
       +
       	wg.Go(func() {

     

       215
       215
       +
       		s.logger.Info("waiting up to 60 seconds for ticker to shut down")

     

       216
       216
       +
       		select {

     

       217
       217
       +
       		case <-tickerShutdown:

     

       218
       218
       +
       			s.logger.Info("ticker shutdown gracefully")

     

       219
       219
       +
       		case <-time.After(60 * time.Second):

     

       220
       220
       +
       			s.logger.Warn("waited 60 seconds for ticker to shut down. forcefully exiting.")

     

       221
       221
       +
       		case <-forceShutdownSignals:

     

       222
       222
       +
       			s.logger.Warn("received forceful shutdown signal before ticker shut down")

     

       223
       223
       +
       		}

     

       224
       224
       +
       	})

     

       225
       225
       +
       

     

       226
       226
       +
       	s.logger.Info("waiting for routines to finish")

     

       227
       227
       +
       	wg.Wait()

     

       160
       228
        
       

     

       161
       229
        
       	s.logger.Info("myaur shutdown")

     

       162
       230