fixing the docker edge flow

Signed-off-by: Daan Gerits <daan.gerits@gmail.com>
wombatwisdom · Oct 21, 2024 · e86dad7 · e86dad7
1 parent a42c1d2
commit e86dad7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/.github/workflows/docker_edge.yml b/.github/workflows/docker_edge.yml
@@ -38,16 +38,8 @@ jobs:
       uses: docker/build-push-action@v6
       with:
         context: ./
-        file: ./resources/docker/Dockerfile
+        file: ./Dockerfile
         builder: ${{ steps.buildx.outputs.name }}
         platforms: linux/amd64,linux/arm64
         push: true
         tags: ghcr.io/${{ github.repository_owner }}/wombat:edge
-
-    - name: Build and push CGO
-      uses: docker/build-push-action@v6
-      with:
-        context: ./
-        file: ./resources/docker/Dockerfile.cgo
-        push: true
-        tags: ghcr.io/${{ github.repository_owner }}/wombat:edge-cgo
diff --git a/Dockerfile b/Dockerfile
@@ -7,8 +7,8 @@ RUN sh -c "$(curl --location https://taskfile.dev/install.sh)" -- -d -b /usr/loc
 
 WORKDIR /go/src/github.com/wombatwisdom/wombat/
 # Update dependencies: On unchanged dependencies, cached layer will be reused
-COPY go.* /go/src/github.com/wombatwisdom/wombat/
-RUN go mod download
+COPY .. /go/src/github.com/wombatwisdom/wombat/
+RUN go mod tidy
 
 # Tag timetzdata required for busybox base image:
 # https://github.com/benthosdev/benthos/issues/897