refactor: remove AX_DB_PATH env var, fix Dockerfile for src/ layout
This commit is contained in:
13
Dockerfile
13
Dockerfile
@@ -4,12 +4,13 @@ WORKDIR /app
|
|||||||
|
|
||||||
ENV GOTOOLCHAIN=auto
|
ENV GOTOOLCHAIN=auto
|
||||||
|
|
||||||
COPY go.mod go.sum ./
|
COPY src/go.mod src/go.sum ./
|
||||||
RUN go mod download
|
RUN go mod download
|
||||||
|
|
||||||
COPY . ./
|
COPY src/ ./
|
||||||
|
|
||||||
RUN CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -o /ax .
|
RUN CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH \
|
||||||
|
go build -ldflags="-s -w" -trimpath -o /ax .
|
||||||
|
|
||||||
FROM alpine:latest
|
FROM alpine:latest
|
||||||
|
|
||||||
@@ -17,10 +18,8 @@ RUN apk --no-cache add ca-certificates
|
|||||||
|
|
||||||
WORKDIR /data
|
WORKDIR /data
|
||||||
|
|
||||||
COPY --from=builder /ax /app/ax
|
COPY --from=builder /ax /usr/local/bin/ax
|
||||||
|
|
||||||
ENV AX_DB_PATH=/data/.ax.db
|
|
||||||
|
|
||||||
EXPOSE 7000
|
EXPOSE 7000
|
||||||
|
|
||||||
ENTRYPOINT ["/app/ax", "serve"]
|
ENTRYPOINT ["ax"]
|
||||||
|
|||||||
@@ -59,14 +59,9 @@ func InitSQLiteStore(path string) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// FindAndOpenSQLiteStore opens the SQLite database. If the AX_DB_PATH environment
|
// FindAndOpenSQLiteStore opens the SQLite database by walking up from the
|
||||||
// variable is set, it uses that path directly. Otherwise, it walks up from the
|
|
||||||
// current working directory to find an .ax/ax.db file.
|
// current working directory to find an .ax/ax.db file.
|
||||||
func FindAndOpenSQLiteStore() (GraphStore, error) {
|
func FindAndOpenSQLiteStore() (GraphStore, error) {
|
||||||
if dbpath := os.Getenv("AX_DB_PATH"); dbpath != "" {
|
|
||||||
return NewSQLiteStore(dbpath)
|
|
||||||
}
|
|
||||||
|
|
||||||
dataRoot, err := FindDataRoot(".local", "share")
|
dataRoot, err := FindDataRoot(".local", "share")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("failed to find data dir: %w", err)
|
return nil, fmt.Errorf("failed to find data dir: %w", err)
|
||||||
|
|||||||
Reference in New Issue
Block a user