Take local platform dependency (#1348)

Author: pdelewski

.github/workflows/build-quesma-docker-image.yml

@@ -64,7 +64,6 @@ jobs:
         uses: docker/build-push-action@v6
         if: ${{ !inputs.PUSH }}
         with:
-          context: ${{ matrix.module }}/.
           tags: |
             quesma/quesma:${{ inputs.VERSION }}
             quesma/quesma:nightly
@@ -80,7 +79,6 @@ jobs:
         uses: docker/build-push-action@v6
         if: ${{ inputs.PUSH }}
         with:
-          context: ${{ matrix.module }}/.
           tags: |
             quesma/quesma:${{ inputs.VERSION }}
             quesma/quesma:nightly
@@ -97,6 +95,6 @@ jobs:
         uses: actions/upload-artifact@v4
         if: ${{ !inputs.PUSH }}
         with:
-          name: ${{ matrix.module }}
+          name: "quesma-nightly" # this is just a name for artifact stored in github, not in dockerhub
           path: /tmp/image.tar
           retention-days: 1

.github/workflows/release.yml

@@ -61,7 +61,6 @@ jobs:
       - name: Build and export
         uses: docker/build-push-action@v6
         with:
-          context: ${{ matrix.module }}/.
           tags: |
             europe-docker.pkg.dev/metal-figure-407109/quesma-nightly/quesma:${{ github.event.inputs.VERSION }}
             europe-docker.pkg.dev/metal-figure-407109/quesma-nightly/quesma:latest

.gitignore

@@ -23,6 +23,8 @@ docker/security/certificate-bundle.zip
 docker/security/clickhouse
 platform/config.yaml
 platform/.installation_id
+cmd/config.yaml
+cmd/.installation_id
 examples/kibana-sample-data/quesma/logs/*
 bin/.running-docker-compose
 docs/public/node_modules

cmd/Dockerfile renamed to Dockerfile

@@ -1,25 +1,19 @@
 FROM golang:alpine AS builder
 
-
-WORKDIR /cmd
-
-COPY go.mod go.sum ./
-
-RUN --mount=type=cache,target=/go/pkg/mod \
-    go mod download
+COPY platform /platform
+COPY cmd /cmd
 
 ENV GOCACHE=/root/.cache/go-build
 ARG QUESMA_BUILD_SHA
 ARG QUESMA_VERSION
 ARG QUESMA_BUILD_DATE
 
-COPY util/healthcheck util/healthcheck
+WORKDIR /cmd
 
 RUN --mount=type=cache,target="/root/.cache/go-build" \
     --mount=type=cache,target=/go/pkg/mod  \
     go build -o healthcheck ./util/healthcheck
 
-COPY . .
 
 RUN --mount=type=cache,target="/root/.cache/go-build" \
     --mount=type=cache,target=/go/pkg/mod  \

bin/build-image.sh

@@ -9,4 +9,4 @@ QUESMA_VERSION="development"
 
 export DOCKER_BUILDKIT=1
 
-docker build --build-arg QUESMA_BUILD_DATE="$QUESMA_BUILD_DATE" --build-arg QUESMA_VERSION="$QUESMA_VERSION" --build-arg QUESMA_BUILD_SHA="$QUESMA_BUILD_SHA" -f cmd/Dockerfile -t quesma/quesma:nightly cmd
+docker build --progress=plain --build-arg QUESMA_BUILD_DATE="$QUESMA_BUILD_DATE" --build-arg QUESMA_VERSION="$QUESMA_VERSION" --build-arg QUESMA_BUILD_SHA="$QUESMA_BUILD_SHA" -f ./Dockerfile -t quesma/quesma:nightly .

ci/ci.yml

@@ -1,7 +1,7 @@
 version: "3.7"
 services:
   quesma:
-    build: ../cmd
+    build: ../
     image: quesma:nightly
     environment:
       - QUESMA_CONFIG_FILE=/mnt/ci-config.yaml

cmd/go.mod

@@ -8,6 +8,8 @@ require (
 	github.com/stretchr/testify v1.10.0
 )
 
+replace github.com/QuesmaOrg/quesma/platform => ../platform
+
 require (
 	filippo.io/edwards25519 v1.1.0 // indirect
 	github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 // indirect