Build ARM64 CLI for Linux as well

Bring back Set up Cloud SDK step to Build the CLI and publish job
Add MizuAgentImageRepo constant and use it as default AgentImage value
2026-02-17 03:19:54 +00:00 · 2022-01-23 20:42:24 +03:00 · 2022-01-23 19:43:20 +03:00 · 2022-01-23 19:31:43 +03:00 · 2022-01-23 19:18:20 +03:00 · 2022-01-23 18:58:45 +03:00
16 changed files with 299 additions and 185 deletions
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -1,72 +1,74 @@
-name: publish
+name: Release

 on:
  push:
    branches:
      - 'develop'
      - 'main'
+      - 'feature/multiarch_build'

 concurrency:
  group: mizu-publish-${{ github.ref }}
  cancel-in-progress: true

 jobs:
-  docker:
+  docker-registry:
+    name: Push Docker image to Docker Hub
    runs-on: ubuntu-latest
+
+    strategy:
+      max-parallel: 2
+      fail-fast: false
+      matrix:
+        target:
+          - amd64
+          - arm64v8
+
    steps:
-      - name: Set up Go 1.16
-        uses: actions/setup-go@v2
-        with:
-          go-version: '1.16'
-      - name: Checkout
+      - name: Check out the repo
        uses: actions/checkout@v2
-      - name: Set up Cloud SDK
-        uses: google-github-actions/setup-gcloud@master
-        with:
-          service_account_key: ${{ secrets.GCR_JSON_KEY }}
-          export_default_credentials: true
-      - uses: haya14busa/action-cond@v1
+
+      - name: Determine versioning strategy
+        uses: haya14busa/action-cond@v1
        id: condval
        with:
          cond: ${{ github.ref == 'refs/heads/main' }}
          if_true: "minor"
          if_false: "patch"
-      - name: Auto Increment Semver Action
+
+      - name: Auto increment SemVer action
        uses: MCKanpolat/auto-semver-action@1.0.5
        id: versioning
        with:
          releaseType: ${{ steps.condval.outputs.value }}
          github_token: ${{ secrets.GITHUB_TOKEN }}
+
      - name: Get version parameters
        shell: bash
        run: |
          echo "##[set-output name=build_timestamp;]$(echo $(date +%s))"
          echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
        id: version_parameters
-      - name: Get base image name
-        shell: bash
-        run: echo "##[set-output name=image;]$(echo gcr.io/up9-docker-hub/mizu/${GITHUB_REF#refs/heads/})"
-        id: base_image_step
+
      - name: Docker meta
        id: meta
-        uses: crazy-max/ghaction-docker-meta@v2
+        uses: docker/metadata-action@v3
        with:
          images: |
-            ${{ steps.base_image_step.outputs.image }}
            up9inc/mizu
          tags: |
            type=raw,${{ steps.versioning.outputs.version }}
-      - name: Login to DockerHub
+          flavor: |
+            latest=auto
+            prefix=
+            suffix=-${{ matrix.target }},onlatest=true
+
+      - name: Login to Docker Hub
        uses: docker/login-action@v1
        with:
          username: ${{ secrets.DOCKERHUB_USER }}
          password: ${{ secrets.DOCKERHUB_PASS }}
-      - name: Login to GCR
-        uses: docker/login-action@v1
-        with:
-          registry: gcr.io
-          username: _json_key
-          password: ${{ secrets.GCR_JSON_KEY }}
+
      - name: Build and push
        uses: docker/build-push-action@v2
        with:
@@ -75,16 +77,198 @@ jobs:
          tags: ${{ steps.meta.outputs.tags }}
          labels: ${{ steps.meta.outputs.labels }}
          build-args: |
+            ARCH=${{ matrix.target }}
            SEM_VER=${{ steps.versioning.outputs.version }}
            BUILD_TIMESTAMP=${{ steps.version_parameters.outputs.build_timestamp }}
            GIT_BRANCH=${{ steps.version_parameters.outputs.branch }}
            COMMIT_HASH=${{ github.sha }}
+
+  gcp-registry:
+    name: Push Docker image to GCR
+    runs-on: ubuntu-latest
+
+    strategy:
+      max-parallel: 2
+      fail-fast: false
+      matrix:
+        target:
+          - amd64
+          - arm64v8
+
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v2
+
+      - name: Set up Cloud SDK
+        uses: google-github-actions/setup-gcloud@master
+        with:
+          service_account_key: ${{ secrets.GCR_JSON_KEY }}
+          export_default_credentials: true
+
+      - name: Determine versioning strategy
+        uses: haya14busa/action-cond@v1
+        id: condval
+        with:
+          cond: ${{ github.ref == 'refs/heads/main' }}
+          if_true: "minor"
+          if_false: "patch"
+
+      - name: Auto increment SemVer action
+        uses: MCKanpolat/auto-semver-action@1.0.5
+        id: versioning
+        with:
+          releaseType: ${{ steps.condval.outputs.value }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Get version parameters
+        shell: bash
+        run: |
+          echo "##[set-output name=build_timestamp;]$(echo $(date +%s))"
+          echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
+        id: version_parameters
+
+      - name: Get base image name
+        shell: bash
+        run: echo "##[set-output name=image;]$(echo gcr.io/up9-docker-hub/mizu/${GITHUB_REF#refs/heads/})"
+        id: base_image_step
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: |
+            ${{ steps.base_image_step.outputs.image }}
+          tags: |
+            type=raw,${{ steps.versioning.outputs.version }}
+          flavor: |
+            latest=auto
+            prefix=
+            suffix=-${{ matrix.target }},onlatest=true
+
+      - name: Login to GCR
+        uses: docker/login-action@v1
+        with:
+          registry: gcr.io
+          username: _json_key
+          password: ${{ secrets.GCR_JSON_KEY }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            ARCH=${{ matrix.target }}
+            SEM_VER=${{ steps.versioning.outputs.version }}
+            BUILD_TIMESTAMP=${{ steps.version_parameters.outputs.build_timestamp }}
+            GIT_BRANCH=${{ steps.version_parameters.outputs.branch }}
+            COMMIT_HASH=${{ github.sha }}
+
+  docker-manifest:
+    name: Create and Push a Docker Manifest
+    runs-on: ubuntu-latest
+    needs: [docker-registry]
+    steps:
+      - name: Determine versioning strategy
+        uses: haya14busa/action-cond@v1
+        id: condval
+        with:
+          cond: ${{ github.ref == 'refs/heads/main' }}
+          if_true: "minor"
+          if_false: "patch"
+
+      - name: Auto increment SemVer action
+        uses: MCKanpolat/auto-semver-action@1.0.5
+        id: versioning
+        with:
+          releaseType: ${{ steps.condval.outputs.value }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Get version parameters
+        shell: bash
+        run: |
+          echo "##[set-output name=build_timestamp;]$(echo $(date +%s))"
+          echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
+        id: version_parameters
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: |
+            up9inc/mizu
+          tags: |
+            type=raw,${{ steps.versioning.outputs.version }}
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USER }}
+          password: ${{ secrets.DOCKERHUB_PASS }}
+
+      - name: Create manifest
+        run: |
+          while IFS= read -r line; do
+            docker manifest create $line --amend $line-amd64 --amend $line-arm64v8
+          done <<< "${{ steps.meta.outputs.tags }}"
+
+      - name: Push manifest
+        run: |
+          while IFS= read -r line; do
+            docker manifest push $line
+          done <<< "${{ steps.meta.outputs.tags }}"
+
+  cli:
+    name: Build the CLI and publish
+    runs-on: ubuntu-latest
+    needs: [docker-manifest, gcp-registry]
+    steps:
+      - name: Set up Go 1.17
+        uses: actions/setup-go@v2
+        with:
+          go-version: '1.17'
+
+      - name: Check out the repo
+        uses: actions/checkout@v2
+
+      - name: Set up Cloud SDK
+        uses: google-github-actions/setup-gcloud@master
+        with:
+          service_account_key: ${{ secrets.GCR_JSON_KEY }}
+          export_default_credentials: true
+
+      - uses: haya14busa/action-cond@v1
+        id: condval
+        with:
+          cond: ${{ github.ref == 'refs/heads/main' }}
+          if_true: "minor"
+          if_false: "patch"
+
+      - name: Auto Increment Semver Action
+        uses: MCKanpolat/auto-semver-action@1.0.5
+        id: versioning
+        with:
+          releaseType: ${{ steps.condval.outputs.value }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Get version parameters
+        shell: bash
+        run: |
+          echo "##[set-output name=build_timestamp;]$(echo $(date +%s))"
+          echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
+        id: version_parameters
+
      - name: Build and Push CLI
        run: make push-cli SEM_VER='${{ steps.versioning.outputs.version }}' BUILD_TIMESTAMP='${{ steps.version_parameters.outputs.build_timestamp }}'
-      - shell: bash
+
+      - name: Log the version into a .txt file
+        shell: bash
        run: |
          echo '${{ steps.versioning.outputs.version }}' >> cli/bin/version.txt
-      - name: publish
+
+      - name: Release
        uses: ncipollo/release-action@v1
        with:
          token: ${{ secrets.GITHUB_TOKEN }}
--- a/74
+++ b/74
@@ -1,4 +1,7 @@
-FROM node:16-slim AS site-build
+ARG ARCH=amd64
+
+### Front-end
+FROM node:16 AS front-end

 WORKDIR /app/ui-build

@@ -9,11 +12,16 @@ COPY ui .
 RUN npm run build


-FROM golang:1.16-alpine AS builder
-# Set necessary environment variables needed for our image.
-ENV CGO_ENABLED=1 GOOS=linux GOARCH=amd64
+### Base of the builder image
+FROM golang:1.17-bullseye AS builder-base

-RUN apk add libpcap-dev gcc g++ make bash perl-utils
+# Set necessary environment variables needed for our image.
+ENV CGO_ENABLED=1 GOOS=linux GOARCH=${GOARCH}
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+        build-essential \
+        libpcap-dev

 # Move to agent working directory (/agent-build).
 WORKDIR /app/agent-build
@@ -23,38 +31,66 @@ COPY shared/go.mod shared/go.mod ../shared/
 COPY tap/go.mod tap/go.mod ../tap/
 COPY tap/api/go.* ../tap/api/
 RUN go mod download
-# cheap trick to make the build faster (As long as go.mod wasn't changes)
+# cheap trick to make the build faster (as long as go.mod did not change)
 RUN go list -f '{{.Path}}@{{.Version}}' -m all | sed 1d | grep -e 'go-cache' | xargs go get

+# Copy and build agent code
+COPY shared ../shared
+COPY tap ../tap
+COPY agent .
+
+
+### Intermediate builder image for AMD64 architecture
+FROM builder-base AS builder-amd64
+
+ENV GOARCH=amd64
+
+
+### Intermediate builder image for ARM64 architecture
+FROM builder-base AS builder-arm64v8
+
+ENV GOARCH=arm64
+ENV CC=aarch64-linux-gnu-gcc
+ENV PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig
+
+RUN dpkg --add-architecture arm64 \
+    && apt-get update \
+    && apt-get install -y --no-install-recommends \
+        gcc-aarch64-linux-gnu \
+        libpcap-dev:arm64
+
+
+### Final builder image where the building happens
+FROM builder-${ARCH} AS builder
+
 ARG COMMIT_HASH
 ARG GIT_BRANCH
 ARG BUILD_TIMESTAMP
 ARG SEM_VER=0.0.0

-# Copy and build agent code
-COPY shared ../shared
-COPY tap ../tap
-COPY agent .
-RUN go build -ldflags="-s -w \
-     -X 'mizuserver/pkg/version.GitCommitHash=${COMMIT_HASH}' \
-     -X 'mizuserver/pkg/version.Branch=${GIT_BRANCH}' \
-     -X 'mizuserver/pkg/version.BuildTimestamp=${BUILD_TIMESTAMP}' \
-     -X 'mizuserver/pkg/version.SemVer=${SEM_VER}'" -o mizuagent .
+WORKDIR /app/agent-build
+
+RUN go build -ldflags="-extldflags '-fuse-ld=bfd' -s -w \
+    -X 'mizuserver/pkg/version.GitCommitHash=${COMMIT_HASH}' \
+    -X 'mizuserver/pkg/version.Branch=${GIT_BRANCH}' \
+    -X 'mizuserver/pkg/version.BuildTimestamp=${BUILD_TIMESTAMP}' \
+    -X 'mizuserver/pkg/version.SemVer=${SEM_VER}'" -o mizuagent .

 COPY devops/build_extensions.sh ..
 RUN cd .. && /bin/bash build_extensions.sh

-FROM alpine:3.15

-RUN apk add bash libpcap-dev
+
+### The shipped image
+ARG ARCH=amd64
+FROM up9inc/debian-pcap:stable-slim-${ARCH}

 WORKDIR /app

 # Copy binary and config files from /build to root folder of scratch container.
 COPY --from=builder ["/app/agent-build/mizuagent", "."]
 COPY --from=builder ["/app/agent/build/extensions", "extensions"]
-COPY --from=site-build ["/app/ui-build/build", "site"]
-RUN mkdir /app/data/
+COPY --from=front-end ["/app/ui-build/build", "site"]

 # gin-gonic runs in debug mode without this
 ENV GIN_MODE=release
--- a/agent/README.md
+++ b/agent/README.md
@@ -1,20 +0,0 @@
-# mizu agent
-Agent for MIZU (API server and tapper)
-Basic APIs:
-* /stats - retrieve statistics of collected data
-* /viewer - web ui
-
-## Remote Debugging
-### Setup remote debugging
-1. Run `go get github.com/go-delve/delve/cmd/dlv`
-2. Create a "Go Remote" run/debug configuration in Intellij, set to localhost:2345
-3. Build and push a debug image using
-   `docker build . -t  gcr.io/up9-docker-hub/mizu/debug:latest -f debug.Dockerfile && docker push gcr.io/up9-docker-hub/mizu/debug:latest`
-
-### Connecting
-1. Start mizu using the cli with the debug
-   image `mizu tap --set agent-image=gcr.io/up9-docker-hub/mizu/debug:latest {tapped_pod_name}`
-2. Forward the debug port using `kubectl port-forward -n default mizu-api-server 2345:2345`
-3. Run the run/debug configuration you've created earlier in Intellij.
-
-<small>Do note that dlv won't start the api until a debugger connects to it.</small>
--- a/agent/go.mod
+++ b/agent/go.mod
@@ -20,7 +20,7 @@ require (
 	github.com/ory/kratos-client-go v0.8.2-alpha.1
 	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/stretchr/testify v1.7.0
-	github.com/up9inc/basenine/client/go v0.0.0-20220110083745-04fbc6c2068d
+	github.com/up9inc/basenine/client/go v0.0.0-20220117225014-f91ba3692a36
 	github.com/up9inc/mizu/shared v0.0.0
 	github.com/up9inc/mizu/tap v0.0.0
 	github.com/up9inc/mizu/tap/api v0.0.0
--- a/agent/go.sum
+++ b/agent/go.sum
@@ -496,8 +496,8 @@ github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
 github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
 github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
-github.com/up9inc/basenine/client/go v0.0.0-20220110083745-04fbc6c2068d h1:WTz53dcfqCIWZpZLQoHbIcNc21s0ZHEZH7EqMPp99qQ=
-github.com/up9inc/basenine/client/go v0.0.0-20220110083745-04fbc6c2068d/go.mod h1:SvJGPoa/6erhUQV7kvHBwM/0x5LyO6XaG2lUaCaKiUI=
+github.com/up9inc/basenine/client/go v0.0.0-20220117225014-f91ba3692a36 h1:WtzDQg2i1KYxRYM2LnFOdIzpxhiEBVKIa7byFXDEdK0=
+github.com/up9inc/basenine/client/go v0.0.0-20220117225014-f91ba3692a36/go.mod h1:SvJGPoa/6erhUQV7kvHBwM/0x5LyO6XaG2lUaCaKiUI=
 github.com/vektah/gqlparser v1.1.2/go.mod h1:1ycwN7Ij5njmMkPPAOaRFY4rET2Enx7IkVv3vaXspKw=
 github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f h1:p4VB7kIXpOQvVn1ZaTIVp+3vuYAXFe3OJEvjbUYJLaA=
 github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
--- a/agent/kratos/build-push-featurebranch.sh
+++ b/agent/kratos/build-push-featurebranch.sh
@@ -8,6 +8,7 @@ GIT_BRANCH=$(git branch | grep \* | cut -d ' ' -f2 | tr '[:upper:]' '[:lower:]')

 DOCKER_REPO=$REPOSITORY/$SERVER_NAME/$GIT_BRANCH
 SEM_VER=${SEM_VER=0.0.0}
+ARCH=amd64

 DOCKER_TAGGED_BUILDS=("$DOCKER_REPO:latest" "$DOCKER_REPO:$SEM_VER")

--- a/cli/Makefile
+++ b/cli/Makefile
@@ -30,15 +30,12 @@ build: ## Build mizu CLI binary (select platform via GOOS / GOARCH env variables
 build-all: ## Build for all supported platforms.
 	@echo "Compiling for every OS and Platform"
 	@mkdir -p bin && sed s/_SEM_VER_/$(SEM_VER)/g README.md.TEMPLATE >  bin/README.md
-	@$(MAKE) build GOOS=darwin GOARCH=amd64
 	@$(MAKE) build GOOS=linux GOARCH=amd64
+	@$(MAKE) build GOOS=linux GOARCH=arm64
+	@$(MAKE) build GOOS=darwin GOARCH=amd64
 	@$(MAKE) build GOOS=darwin GOARCH=arm64
 	@$(MAKE) build GOOS=windows GOARCH=amd64
 	@mv ./bin/mizu_windows_amd64 ./bin/mizu.exe
-	@# $(MAKE) GOOS=linux GOARCH=386
-	@# $(MAKE) GOOS=windows GOARCH=386
-	@# $(MAKE) GOOS=linux GOARCH=arm64
-	@# $(MAKE) GOOS=windows GOARCH=arm64
 	@echo "---------"
 	@find ./bin -ls

--- a/cli/README.md.TEMPLATE
+++ b/cli/README.md.TEMPLATE
@@ -3,22 +3,27 @@ Full changelog for stable release see in [docs](https://github.com/up9inc/mizu/b

 ## Download Mizu for your platform

-**Mac** (Intel)
+**Mac** (x86-64/Intel)
 ```
 curl -Lo mizu https://github.com/up9inc/mizu/releases/download/_SEM_VER_/mizu_darwin_amd64 && chmod 755 mizu
 ```

-**Mac** (Apple M1 silicon)
+**Mac** (AArch64/Apple M1 silicon)
 ```
 curl -Lo mizu https://github.com/up9inc/mizu/releases/download/_SEM_VER_/mizu_darwin_arm64 && chmod 755 mizu
 ```

-**Linux** 
+**Linux** (x86-64)
 ```
 curl -Lo mizu https://github.com/up9inc/mizu/releases/download/_SEM_VER_/mizu_linux_amd64 && chmod 755 mizu
 ```

-**Windows** (Intel 64bit)
+**Linux** (x86-64)
+```
+curl -Lo mizu https://github.com/up9inc/mizu/releases/download/_SEM_VER_/mizu_linux_arm64 && chmod 755 mizu
+```
+
+**Windows** (x86-64)
 ```
 curl -LO https://github.com/up9inc/mizu/releases/download/_SEM_VER_/mizu.exe
 ```
--- a/cli/config/configStruct.go
+++ b/cli/config/configStruct.go
@@ -2,15 +2,16 @@ package config

 import (
 	"fmt"
+	"os"
+	"path"
+	"path/filepath"
+
 	"github.com/op/go-logging"
 	"github.com/up9inc/mizu/cli/config/configStructs"
 	"github.com/up9inc/mizu/cli/mizu"
 	"github.com/up9inc/mizu/shared"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/util/homedir"
-	"os"
-	"path"
-	"path/filepath"
 )

 const (
@@ -52,7 +53,7 @@ func (config *ConfigStruct) validate() error {
 func (config *ConfigStruct) SetDefaults() {
 	config.BasenineImage = fmt.Sprintf("%s:%s", shared.BasenineImageRepo, shared.BasenineImageTag)
 	config.KratosImage = shared.KratosImageDefault
-	config.AgentImage = fmt.Sprintf("gcr.io/up9-docker-hub/mizu/%s:%s", mizu.Branch, mizu.SemVer)
+	config.AgentImage = fmt.Sprintf("%s:%s", shared.MizuAgentImageRepo, mizu.SemVer)
 	config.ConfigFilePath = path.Join(mizu.GetMizuFolderPath(), "config.yaml")
 }

--- a/debug.Dockerfile
+++ b/debug.Dockerfile
@@ -1,67 +0,0 @@
-# creates image in which mizu agent is remotely debuggable using delve
-FROM node:16-slim AS site-build
-
-WORKDIR /app/ui-build
-
-COPY ui/package.json .
-COPY ui/package-lock.json .
-RUN npm i
-COPY ui .
-RUN npm run build
-
-FROM golang:1.16-alpine AS builder
-# Set necessary environment variables needed for our image.
-ENV CGO_ENABLED=1 GOOS=linux GOARCH=amd64
-
-RUN apk add libpcap-dev gcc g++ make bash perl-utils
-
-# Move to agent working directory (/agent-build).
-WORKDIR /app/agent-build
-
-COPY agent/go.mod agent/go.sum ./
-COPY shared/go.mod shared/go.mod ../shared/
-COPY tap/go.mod tap/go.mod ../tap/
-COPY tap/api/go.* ../tap/api/
-RUN go mod download
-# cheap trick to make the build faster (As long as go.mod wasn't changes)
-RUN go list -f '{{.Path}}@{{.Version}}' -m all | sed 1d | grep -e 'go-cache' | xargs go get
-
-ARG COMMIT_HASH
-ARG GIT_BRANCH
-ARG BUILD_TIMESTAMP
-ARG SEM_VER=0.0.0
-
-# Copy and build agent code
-COPY shared ../shared
-COPY tap ../tap
-COPY agent .
-# Include gcflags for debugging
-RUN go build -gcflags="all=-N -l" -o mizuagent .
-
-COPY devops/build_extensions_debug.sh ..
-RUN cd .. && /bin/bash build_extensions_debug.sh
-
-FROM golang:1.16-alpine
-
-# Set necessary environment variables needed for our image.
-RUN apk add bash libpcap-dev gcc g++
-
-WORKDIR /app
-
-# Copy binary and config files from /build to root folder of scratch container.
-COPY --from=builder ["/app/agent-build/mizuagent", "."]
-COPY --from=builder ["/app/agent/build/extensions", "extensions"]
-COPY --from=site-build ["/app/ui-build/build", "site"]
-RUN mkdir /app/data/
-
-# install delve
-ENV CGO_ENABLED=1 GOOS=linux GOARCH=amd64
-RUN go get github.com/go-delve/delve/cmd/dlv
-
-ENV GIN_MODE=debug
-
-# delve ports
-EXPOSE 2345 2346
-
-# this script runs both apiserver and passivetapper and exits either if one of them exits, preventing a scenario where the container runs without one process
-ENTRYPOINT "/app/mizuagent"
--- a/devops/build-agent-ci.sh
+++ b/devops/build-agent-ci.sh
@@ -8,6 +8,7 @@ GIT_BRANCH=ci

 DOCKER_REPO=$REPOSITORY/$SERVER_NAME/$GIT_BRANCH
 SEM_VER=${SEM_VER=0.0.0}
+ARCH=amd64

 DOCKER_TAGGED_BUILD="$DOCKER_REPO:$SEM_VER"

--- a/devops/build-push-featurebranch-debug.sh
+++ b/devops/build-push-featurebranch-debug.sh
@@ -1,28 +0,0 @@
-#!/bin/bash
-set -e
-
-GCP_PROJECT=up9-docker-hub
-REPOSITORY=gcr.io/$GCP_PROJECT
-SERVER_NAME=mizu
-GIT_BRANCH=$(git branch | grep \* | cut -d ' ' -f2 | tr '[:upper:]' '[:lower:]')
-
-DOCKER_REPO=$REPOSITORY/$SERVER_NAME/$GIT_BRANCH
-SEM_VER=${SEM_VER=0.0.0}
-
-DOCKER_TAGGED_BUILDS=("$DOCKER_REPO:latest" "$DOCKER_REPO:$SEM_VER")
-
-if [ "$GIT_BRANCH" = 'develop' -o "$GIT_BRANCH" = 'master' -o "$GIT_BRANCH" = 'main' ]
-then
-  echo "Pushing to $GIT_BRANCH is allowed only via CI"
-  exit 1
-fi
-
-echo "building ${DOCKER_TAGGED_BUILDS[@]}"
-DOCKER_TAGS_ARGS=$(echo ${DOCKER_TAGGED_BUILDS[@]/#/-t }) # "-t FIRST_TAG -t SECOND_TAG ..."
-docker build -f debug.Dockerfile $DOCKER_TAGS_ARGS --build-arg SEM_VER=${SEM_VER} --build-arg BUILD_TIMESTAMP=${BUILD_TIMESTAMP} --build-arg GIT_BRANCH=${GIT_BRANCH} --build-arg COMMIT_HASH=${COMMIT_HASH} .
-
-for DOCKER_TAG in "${DOCKER_TAGGED_BUILDS[@]}"
-do
-  echo pushing "$DOCKER_TAG"
-  docker push "$DOCKER_TAG"
-done
--- a/devops/build-push-featurebranch.sh
+++ b/devops/build-push-featurebranch.sh
@@ -8,6 +8,7 @@ GIT_BRANCH=$(git branch | grep \* | cut -d ' ' -f2 | tr '[:upper:]' '[:lower:]')

 DOCKER_REPO=$REPOSITORY/$SERVER_NAME/$GIT_BRANCH
 SEM_VER=${SEM_VER=0.0.0}
+ARCH=amd64

 DOCKER_TAGGED_BUILDS=("$DOCKER_REPO:latest" "$DOCKER_REPO:$SEM_VER")

--- a/shared/consts.go
+++ b/shared/consts.go
@@ -14,9 +14,10 @@ const (
 	GoGCEnvVar                       = "GOGC"
 	DefaultApiServerPort             = 8899
 	LogLevelEnvVar                   = "LOG_LEVEL"
+	MizuAgentImageRepo               = "docker.io/up9inc/mizu"
 	BasenineHost                     = "127.0.0.1"
 	BaseninePort                     = "9099"
-	BasenineImageRepo                = "ghcr.io/up9inc/basenine"
-	BasenineImageTag                 = "v0.3.0"
+	BasenineImageRepo                = "docker.io/up9inc/basenine"
+	BasenineImageTag                 = "v0.4.12"
 	KratosImageDefault               = "gcr.io/up9-docker-hub/mizu-kratos/stable:0.0.0"
 )
--- a/tap/extensions/kafka/go.mod
+++ b/tap/extensions/kafka/go.mod
@@ -4,8 +4,9 @@ go 1.16

 require (
 	github.com/fatih/camelcase v1.0.0
+	github.com/klauspost/compress v1.14.1 // indirect
 	github.com/ohler55/ojg v1.12.12
-	github.com/segmentio/kafka-go v0.4.17
+	github.com/segmentio/kafka-go v0.4.27
 	github.com/up9inc/mizu/tap/api v0.0.0
 )

--- a/tap/extensions/kafka/go.sum
+++ b/tap/extensions/kafka/go.sum
@@ -11,8 +11,9 @@ github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M=
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
-github.com/klauspost/compress v1.9.8 h1:VMAMUUOh+gaxKTMk+zqbjsSjsIcUcL/LF4o63i82QyA=
 github.com/klauspost/compress v1.9.8/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
+github.com/klauspost/compress v1.14.1 h1:hLQYb23E8/fO+1u53d02A97a8UnsddcvYzq4ERRU4ds=
+github.com/klauspost/compress v1.14.1/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
 github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
@@ -23,8 +24,8 @@ github.com/ohler55/ojg v1.12.12/go.mod h1:LBbIVRAgoFbYBXQhRhuEpaJIqq+goSO63/FQ+n
 github.com/pierrec/lz4 v2.6.0+incompatible h1:Ix9yFKn1nSPBLFl/yZknTp8TU5G4Ps0JDmguYK6iH1A=
 github.com/pierrec/lz4 v2.6.0+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/segmentio/kafka-go v0.4.17 h1:IyqRstL9KUTDb3kyGPOOa5VffokKWSEzN6geJ92dSDY=
-github.com/segmentio/kafka-go v0.4.17/go.mod h1:19+Eg7KwrNKy/PFhiIthEPkO8k+ac7/ZYXwYM9Df10w=
+github.com/segmentio/kafka-go v0.4.27 h1:sIhEozeL/TLN2mZ5dkG462vcGEWYKS+u31sXPjKhAM4=
+github.com/segmentio/kafka-go v0.4.27/go.mod h1:XzMcoMjSzDGHcIwpWUI7GB43iKZ2fTVmryPSGLf/MPg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I=
Author	SHA1	Message	Date
M. Mert Yildiran	37459cc03f	Build ARM64 CLI for Linux as well	2022-01-23 20:42:24 +03:00
M. Mert Yildiran	7a6856a6e9	Bring back `Set up Cloud SDK` step to `Build the CLI and publish` job	2022-01-23 19:43:20 +03:00
M. Mert Yildiran	4ddcb7cb92	Add `MizuAgentImageRepo` constant and use it as default `AgentImage` value	2022-01-23 19:31:43 +03:00
M. Mert Yildiran	d782380dc5	Remove the lines that are forgotten to be removed from the shell scripts	2022-01-23 19:18:20 +03:00
M. Mert Yildiran	f9325792d2	Tag correctly and set `ARCH` Docker argument	2022-01-23 18:58:45 +03:00
M. Mert Yildiran	d30be4c1f0	Enable `publish.yml` for `feature/multiarch_build` branch	2022-01-23 18:50:15 +03:00
M. Mert Yildiran	0286e0140e	Update `publish.yml`	2022-01-23 18:18:27 +03:00
M. Mert Yildiran	ef355331ce	Fix the indentation in the `Dockerfile`	2022-01-23 17:45:13 +03:00
M. Mert Yildiran	aed86bb3bc	Merge branch 'develop' into feature/multiarch_build	2022-01-23 17:42:07 +03:00
M. Mert Yildiran	c55adcd357	Use `debian:stable-slim` as the base	2022-01-23 17:40:57 +03:00
M. Mert Yildiran	20ffe2a2de	Upgrade Basenine version to `v0.4.12`	2022-01-23 16:41:29 +03:00
M. Mert Yildiran	677669fbb9	Merge branch 'develop' into feature/multiarch_build	2022-01-23 16:30:03 +03:00
M. Mert Yildiran	f5a0cb01a4	Replace `mertyildiran/debian-pcap` with `up9inc/debian-pcap`	2022-01-23 14:26:45 +03:00
M. Mert Yildiran	09111aeb1d	Create a custom base (`debian:buster-slim` based) image for the shipped image	2022-01-23 00:18:56 +03:00
M. Mert Yildiran	83fe96259b	Merge branch 'develop' into feature/multiarch_build	2022-01-22 23:31:05 +03:00
M. Mert Yildiran	4003718011	Delete `debug.Dockerfile`	2022-01-22 23:29:59 +03:00
M. Mert Yildiran	5ab763b949	Update `Dockerfile` to have cross-compilation on an AMD64 machine Also revert changes in the shell scripts	2022-01-22 23:28:04 +03:00
M. Mert Yildiran	4ca9606148	Fix `asm: xxhash_amd64.s:120: when dynamic linking, R15 is clobbered by a global variable access` error	2022-01-22 22:13:23 +03:00
M. Mert Yildiran	4fde6e9dac	Merge branch 'develop' into feature/multiarch_build	2022-01-20 21:28:06 +03:00
M. Mert Yıldıran	f973748c61	Merge branch 'develop' into feature/multiarch_build	2022-01-18 13:49:28 +03:00
M. Mert Yildiran	bb1ac08c94	Fix the incompatibility issue between Go plugins and gold linker in Alpine inside `Dockerfile`	2022-01-18 03:35:02 +03:00
M. Mert Yildiran	1374a7982d	Fix `Dockerfile`	2022-01-18 01:52:44 +03:00
M. Mert Yildiran	1980e9e5ed	Fix the oopsie and reduce duplications	2022-01-18 01:15:04 +03:00
M. Mert Yildiran	92ea8cdb2c	Oops forgot to update the 10th duplicated shell script	2022-01-18 00:37:34 +03:00
M. Mert Yildiran	0f7bd9ea02	Upgrade the Basenine version from `v0.4.6` to `v0.4.10`	2022-01-18 00:32:01 +03:00
M. Mert Yildiran	a57d078b04	Have separate build arguments for `ARCH` and `GOARCH`	2022-01-18 00:31:41 +03:00
M. Mert Yildiran	c39576b559	Switch `BasenineImageRepo` to Docker Hub	2022-01-17 23:35:02 +03:00
M. Mert Yildiran	52f1eae341	Update `publish.yml` to have `ARCH` build argument	2022-01-17 23:28:34 +03:00
M. Mert Yildiran	e8d7cd0751	Upgrade the Basenine version from `v0.3.0` to `v0.4.6`	2022-01-17 22:44:02 +03:00
M. Mert Yildiran	dd8412bf62	Remove `docs/CHANGES.md`	2022-01-17 16:26:08 +03:00
M. Mert Yildiran	796457d876	Merge branch 'develop' into feature/multiarch_build	2022-01-17 16:25:01 +03:00
M. Mert Yildiran	5130b09c40	Update `Dockerfile` to have `ARCH` build argument	2022-01-17 16:07:02 +03:00
Alex Haiut	6ff5166f21	added changelog	2022-01-16 12:35:14 +02:00
Alex Haiut	907b8032f2	modified Dockerfile to work for both amd64 (Intel) and arm64 (M1)	2022-01-16 12:00:16 +02:00