Merge pull request #48 from aifoundry-org/docker-images

docker build support

Author: deitch

.github/workflows/ci.yaml

@@ -48,4 +48,23 @@ jobs:
           go-version-file: 'go.mod'
       - name: Build
         run: |
-            make build
+            make build ARCH=${{ matrix.arch }} OS=${{ matrix.os }}
+  image:
+    runs-on: ubuntu-latest
+    steps:            
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3  
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Build Docker image
+        uses: docker/build-push-action@v6
+        with:
+          platforms: linux/amd64,linux/arm64,linux/riscv64
+          context: .
+          file: Dockerfile
+          push: false
+          tags: build

.github/workflows/publish.yaml

@@ -0,0 +1,58 @@
+name: Publish Docker Image
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  build-and-push:
+    name: Build and Push Docker Image
+    runs-on: ubuntu-latest
+    
+    permissions:
+      contents: read
+      packages: write
+    
+    env:
+      IMAGE_NAME: ${{ secrets.IMAGE_NAME || 'aifoundryorg/oxide-controller' }}
+    
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      
+      - name: Extract metadata for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: docker.io/${{ env.IMAGE_NAME }}
+          tags: |
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=sha
+      
+      - name: Log in to container registry
+        uses: docker/login-action@v3
+        with:
+          registry: docker.io
+          username: ${{ secrets.DH_REGISTRY_USERNAME }}
+          password: ${{ secrets.DH_REGISTRY_TOKEN }}
+      
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v6
+        with:
+          platforms: linux/amd64,linux/arm64,linux/riscv64
+          context: .
+          file: Dockerfile
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

Dockerfile

@@ -0,0 +1,20 @@
+FROM --platform=$BUILDPLATFORM golang:1.24.3-alpine3.21 AS build
+
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+ARG TARGETARCH
+ARG TARGETOS
+
+RUN apk update && \
+    apk add --no-cache make git
+
+WORKDIR /app
+COPY go.mod go.sum ./
+RUN go mod download
+COPY . .
+RUN make install TARGET=/oxide-controller OS=$(TARGETOS) ARCH=$(TARGETARCH)
+
+FROM scratch
+COPY --from=build /oxide-controller /oxide-controller
+
+ENTRYPOINT ["/oxide-controller"]

Makefile

@@ -3,13 +3,26 @@
 all: build link
 
 BINDIR ?= bin
-ARCH ?= $(shell go env GOARCH)
-OS ?= $(shell go env GOOS)
-CONTROLLER_GENERIC ?= $(BINDIR)/oxide-controller
+
+# determine my architecture and OS
+MYARCH = $(shell go env GOARCH)
+MYOS = $(shell go env GOOS)
+
+# default to the current architecture and OS
+ARCH ?= $(MYARCH)
+OS ?= $(MYOS)
+CONTROLLER_NAME ?= oxide-controller
+CONTROLLER_GENERIC ?= $(BINDIR)/$(CONTROLLER_NAME)
 CONTROLLER ?= $(CONTROLLER_GENERIC)-$(OS)-$(ARCH)
+TARGET ?= /usr/local/bin/$(CONTROLLER_NAME)
+
+IMAGE_NAME ?= aifoundryorg/oxide-controller
 
 build: $(CONTROLLER)
 
+install: build
+	@cp $(CONTROLLER) $(TARGET)
+
 $(BINDIR):
 	@mkdir -p $@
 
@@ -19,7 +32,14 @@ $(CONTROLLER): $(BINDIR)
 link: $(CONTROLLER) $(CONTROLLER_GENERIC)
 
 $(CONTROLLER_GENERIC): $(CONTROLLER)
+ifeq ($(ARCH),$(MYARCH))
+ifeq ($(OS),$(MYOS))
 	@ln -sf $(notdir $(CONTROLLER)) $@
+endif
+endif
 
 test:
 	go test -v ./...
+
+image:
+	docker build -t oxide-controller:latest .