diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index bbe5d04..1a46be9 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -28,8 +28,6 @@ jobs: tags: ${{ github.event_type == 'push' && github.ref_name || github.sha }} containerfiles: | ./Containerfile - extra-args: | - --target=build - name: Run go vet run: podman run phantom:${{ github.sha }} go vet -v ./... - name: Run go test diff --git a/Containerfile b/Containerfile index 2fe5ded..b77a7fb 100644 --- a/Containerfile +++ b/Containerfile @@ -1,11 +1,13 @@ -FROM docker.io/golang:1.24.5-alpine3.22 AS build -WORKDIR /app -COPY . . -RUN apk add g++ binutils make libc-dev patch opencv-dev icu-libs -RUN go build -ldflags "-w -s" cmd/main.go +FROM ghcr.io/hybridgroup/opencv:4.9.0 AS artifacts + +RUN wget https://go.dev/dl/go1.25.0.linux-arm64.tar.gz && rm -rf /usr/local/go && tar -C /usr/local -xzf go1.25.0.linux-arm64.tar.gz + +ENV GOPATH=/go +ENV PATH=$PATH:$GOPATH/bin:/usr/local/go/bin -FROM docker.io/alpine:3.22 AS delivery WORKDIR /app -RUN apk add musl opencv icu-libs -COPY --from=build /app/main /app/main -COPY --from=build /app/templates /app/templates +COPY go.mod go.mod +RUN go mod download + +COPY . . +RUN go build -v -x -ldflags "-w -s" -o main cmd/main.go diff --git a/cmd/main.go b/cmd/main.go index 42db73d..f9ca768 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -5,6 +5,6 @@ import ( ) func main() { - svc := http.NewService("127.0.0.1:8080") + svc := http.NewService("0.0.0.0:8080") svc.Run() } diff --git a/go.mod b/go.mod index c803c4f..b1f7012 100644 --- a/go.mod +++ b/go.mod @@ -2,4 +2,4 @@ module github.com/bugbundle/phantom go 1.22.2 -require gocv.io/x/gocv v0.42.0 +require gocv.io/x/gocv v0.41.0 diff --git a/go.sum b/go.sum index f377ab5..ffdc39e 100644 --- a/go.sum +++ b/go.sum @@ -1,2 +1,2 @@ -gocv.io/x/gocv v0.42.0 h1:AAsrFJH2aIsQHukkCovWqj0MCGZleQpVyf5gNVRXjQI= -gocv.io/x/gocv v0.42.0/go.mod h1:zYdWMj29WAEznM3Y8NsU3A0TRq/wR/cy75jeUypThqU= +gocv.io/x/gocv v0.41.0 h1:KM+zRXUP28b6dHfhy+4JxDODbCNQNtLg8kio+YE7TqA= +gocv.io/x/gocv v0.41.0/go.mod h1:zYdWMj29WAEznM3Y8NsU3A0TRq/wR/cy75jeUypThqU=