fix: CI Docker build (#92)

* fix: CI Docker build invalid ref to Dockerfile

* feat: optimizing go & npm build by levaraging cache

* chore: bump go version

Author: xBlaz3kx

.github/workflows/build-image.yaml

@@ -35,19 +35,6 @@ jobs:
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
 
-      - name: Generate Docker metadata
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: |
-            xblaz3kx/${{ github.repository }}
-          tags: |
-            type=ref,event=branch
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-          flavor: |
-            latest=true  
-
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@v3
@@ -71,13 +58,28 @@ jobs:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
 
+      - name: Generate Docker metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            xblaz3kx/chargepi
+          tags: |
+            type=ref,event=branch
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=sha,event=pr
+          flavor: |
+            latest=true 
+
       - name: Build and push
         uses: docker/build-push-action@v6
         with:
           context: .
           target: chargepi
-          build-args: --build-arg READER_CONNECTION_TYPE="pn532_uart"
-          file: ./build/package/Dockerfile
+          build-args: |
+            READER_CONNECTION_TYPE="pn532_uart"
+          file: ./build/Dockerfile
           platforms: linux/arm64
-          push: true
+          push: ${{ github.event_name == 'push' }}
           tags: ${{ steps.meta.outputs.tags }}

build/Dockerfile

@@ -1,11 +1,15 @@
-FROM --platform=$BUILDPLATFORM golang:1.18 as base
+FROM --platform=$BUILDPLATFORM golang:1.23.0 AS base
 
-COPY . /ChargePi/src
 WORKDIR /ChargePi/src
+COPY . /ChargePi/src
 
 ARG READER_TYPE
 ENV READER_TYPE=$READER_TYPE
 
+ENV GOCACHE=/root/.cache/go-build
+ENV GOMODCACHE=/root/.cache/go-build
+ENV GO111MODULE=on
+
 # Install dependencies
 RUN chmod +x /ChargePi/src/scripts/install-dependencies.sh
 RUN /ChargePi/src/scripts/install-dependencies.sh $READER_TYPE 0
@@ -15,20 +19,22 @@ ENV GOARCH=arm64
 ENV CGO=1
 
 # Compile the client
-RUN go mod download
+RUN --mount=type=cache,target=/root/.cache/go-build go mod download
 RUN go mod verify
-RUN go build -o ChargePi .
+RUN --mount=type=cache,target="/root/.cache/go-build" go build -o ChargePi .
 
 FROM node:19 as build-ui
 
-COPY ./ui /ui
 WORKDIR /ui
 
-RUN npm install
+COPY ./ui/package*.json .
+COPY ./ui .
+
+RUN --mount=type=cache,target=/root/.npm npm install
 RUN npm run build
 
 # Test the client
-FROM --platform=$BUILDPLATFORM vektra/mockery:v2.9.4 as test
+FROM --platform=$BUILDPLATFORM vektra/mockery:v2.9.4 AS test
 
 COPY --from=base /ChargePi/src /ChargePi/src
 WORKDIR /ChargePi/src
@@ -44,7 +50,7 @@ RUN mockery
 # Run tests
 CMD ["go", "test","-v","./..."]
 
-FROM --platform=$BUILDPLATFORM alpine as chargepi
+FROM --platform=$BUILDPLATFORM alpine AS chargepi
 
 WORKDIR /etc/ChargePi
 

go.mod

@@ -1,6 +1,7 @@
 module github.com/ChargePi/ChargePi-go
 
-go 1.22.1
+go 1.23.0
+
 toolchain go1.23.7
 
 require (
@@ -46,6 +47,7 @@ require (
 	github.com/orandin/lumberjackrus v1.0.1
 	github.com/pkg/errors v0.9.1
 	github.com/toorop/gin-logrus v0.0.0-20210225092905-2c785434f26f
+	github.com/warthog618/modem v0.4.0
 )
 
 require (
@@ -103,6 +105,7 @@ require (
 	github.com/spf13/afero v1.11.0 // indirect
 	github.com/spf13/cast v1.6.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/stretchr/objx v0.5.2 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.12 // indirect

go.sum

@@ -233,6 +233,7 @@ github.com/montanaflynn/stats v0.7.1 h1:etflOAAHORrCC44V+aR6Ftzort912ZU+YLiSTuV8
 github.com/montanaflynn/stats v0.7.1/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow=
 github.com/nicksnyder/go-i18n/v2 v2.2.1 h1:aOzRCdwsJuoExfZhoiXHy4bjruwCMdt5otbYojM/PaA=
 github.com/nicksnyder/go-i18n/v2 v2.2.1/go.mod h1:fF2++lPHlo+/kPaj3nB0uxtPwzlPm+BlgwGX7MkeGj0=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/oapi-codegen/runtime v1.0.0 h1:P4rqFX5fMFWqRzY9M/3YF9+aPSPPB06IzP2P7oOxrWo=
 github.com/oapi-codegen/runtime v1.0.0/go.mod h1:LmCUMQuPB4M/nLXilQXhHw+BLZdDb18B34OO356yJ/A=
 github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 h1:lDH9UUVJtmYCjyT0CI4q8xvlXPxeZ0gYCVvWbmPlp88=
@@ -316,6 +317,7 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
 github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
+github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA=
 github.com/tavsec/gin-healthcheck v1.6.3 h1:iwUljulXw71BK+16k/MNGGWG5pFISv1UNw3xQNKxMX4=
 github.com/tavsec/gin-healthcheck v1.6.3/go.mod h1:fc1owE+lhHxEwAq2MQog7hgBTZGbCOqbEHvwhXIytkQ=
 github.com/toorop/gin-logrus v0.0.0-20210225092905-2c785434f26f h1:oqdnd6OGlOUu1InG37hWcCB3a+Jy3fwjylyVboaNMwY=
@@ -329,6 +331,9 @@ github.com/warthog618/go-gpiosim v0.1.0 h1:2rTMTcKUVZxpUuvRKsagnKAbKpd3Bwffp87xy
 github.com/warthog618/go-gpiosim v0.1.0/go.mod h1:Ngx/LYI5toxHr4E+Vm6vTgCnt0of0tktsSuMUEJ2wCI=
 github.com/warthog618/gpiod v0.8.2 h1:2HgQ9pNowPp7W77sXhX5ut5Tqq1WoS3t7bXYDxtYvxc=
 github.com/warthog618/gpiod v0.8.2/go.mod h1:O7BNpHjCn/4YS5yFVmoFZAlY1LuYuQ8vhPf0iy/qdi4=
+github.com/warthog618/modem v0.4.0 h1:QmNRbVopcJYTEalWePSgKd5rhpQW5x/yptojTFVdjjg=
+github.com/warthog618/modem v0.4.0/go.mod h1:9b3nNrk7JZRskP+TpHQppfz5QxRKkQGdgeq2Fi0QHcI=
+github.com/warthog618/sms v0.3.0/go.mod h1:+bYZGeBxu003sxD5xhzsrIPBAjPBzTABsRTwSpd7ld4=
 github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c=
 github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
 github.com/xdg-go/scram v1.1.2 h1:FHX5I5B4i4hKRVRBCFRxq1iQRej7WO3hhBuJf+UUySY=
@@ -405,6 +410,7 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200413165638-669c56c373c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -474,6 +480,7 @@ google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojt
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=