Switch to jo-micro/builder

.drone.yml

@@ -14,20 +14,7 @@ trigger:
   - tag
 
 steps:
-- name: build-builder
-  image: plugins/docker
-  settings:
-    registry: registry.fk.jochum.dev
-    username: robot$jo-micro+drone
-    password: 
-      from_secret: registry.fk.jochum.dev-robot
-    dockerfile: ./docker/builder/Dockerfile
-    context: ./docker/builder/
-    repo: registry.fk.jochum.dev/jo-micro/router-builder
-    tags: 
-    - latest
-
-- name: build-router
+- name: build
   image: plugins/docker
   settings:
     registry: registry.fk.jochum.dev

README.md

@@ -98,7 +98,7 @@ func main() {
 task
 ```
 
-#### Remove everything except the resulting podman images created by task
+#### Remove everything
 
 ```bash
 task rm

Taskfile.yml

@@ -25,27 +25,6 @@ tasks:
     cmds:
       - podman volume inspect micro_router_go 1>/dev/null 2>&1 || podman volume create micro_router_go
 
-  build:builder:
-    deps: 
-      - volume
-    cmds: 
-      - podman build -v "{{.VOLUME_PATH}}:/go:rw" -t registry.fk.jochum.dev/jo-micro/router-builder:latest -f ./docker/builder/Dockerfile ./docker/builder/
-    sources:
-      - ./docker/builder/**/*
-    vars:
-      VOLUME_PATH:
-        sh: podman volume inspect micro_router_go  --format "{{"{{"}}.Mountpoint{{"}}"}}"
-
-  builder:
-    desc: Run something in the builder container for example "task builder -- go get -u ./..."
-    deps:
-      - build:builder
-    cmds:
-      - podman run --rm -v "$PWD:/code:rw" -v "{{.VOLUME_PATH}}:/go:rw" registry.fk.jochum.dev/jo-micro/router-builder:latest {{.CLI_ARGS}}
-    vars:
-      VOLUME_PATH:
-        sh: podman volume inspect micro_router_go  --format "{{"{{"}}.Mountpoint{{"}}"}}"
-
   protoc:
     desc: Generate protobruf go files
     sources:
@@ -59,10 +38,8 @@ tasks:
     deps:
       - protoc
     cmds:
-      - podman build -v "$PWD:/code:rw" -v "{{.VOLUME_PATH}}:/go:rw" --build-arg CACHEBUST={{.DATE}} --build-arg VERSION={{.VERSION}} -t registry.fk.jochum.dev/jo-micro/router:latest -f ./docker/router/Dockerfile .
+      - podman build -v "$PWD:/code:rw" -v "{{.VOLUME_PATH}}:/go:rw" --build-arg VERSION={{.VERSION}} -t registry.fk.jochum.dev/jo-micro/router:latest -f ./docker/router/Dockerfile .
     vars:
-      DATE:
-        sh: date +%s
       VOLUME_PATH:
         sh: podman volume inspect micro_router_go  --format "{{"{{"}}.Mountpoint{{"}}"}}"
   
@@ -88,8 +65,6 @@ tasks:
   rm:
     desc: Remove all persistent data
     cmds:
-      - podman image rm registry.fk.jochum.dev/jo-micro/router-builder:latest || exit 0
-      # Don't delete the result
-      # - podman image rm registry.fk.jochum.dev/jo-micro/router:latest || exit 0
+      - podman image rm registry.fk.jochum.dev/jo-micro/router:latest || exit 0
       - podman volume rm micro_router_go || exit 0
       - rm -rf $PWD/.task

docker/builder/Dockerfile

@@ -1,20 +0,0 @@
-FROM registry.fk.jochum.dev/docker_hub_cache/library/golang:1.19
-
-# Install packages
-RUN apt-get update --allow-releaseinfo-change && \
-    apt-get --no-install-recommends --no-install-suggests --yes --quiet install \
-        git-core ca-certificates make wget unzip && \
-    cd /tmp && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.5/protoc-21.5-linux-x86_64.zip && \
-    unzip protoc-21.5-linux-x86_64.zip -d /usr/local/ && chmod +x /usr/local/bin/protoc
-
-VOLUME [ "/code", "/go" ]
-
-# RUN go mod download
-ENV GOPATH="/go"
-
-# Install protoc-gen-go + protoc-gen-micro
-RUN cd /tmp; go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.28; go install github.com/go-micro/generator/cmd/protoc-gen-micro@v1.0.0
-
-WORKDIR /code
-
-COPY ./scripts /scripts

docker/builder/scripts/protoc_gen.sh

@@ -1,2 +0,0 @@
-#!/bin/sh
-find . -name '*.proto' -print0 | xargs -0 -I {} /bin/sh -c 'cd $(dirname $1); PATH=$PATH:/go/bin protoc --micro_out=paths=source_relative:. --go_out=paths=source_relative:. $(basename $1)' '_' '{}'

docker/builder/scripts/upgrade_deps.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-set -ex
-
-go mod tidy -go=1.19
-
-for i in $(find . -name 'main.go'); do
-    pushd $(dirname $i)
-    CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go get -installsuffix cgo -ldflags="-w -s" -u ./...
-    popd
-done

docker/router/Dockerfile

@@ -1,18 +1,18 @@
 # STEP 1 build executable binary
-FROM registry.fk.jochum.dev/jo-micro/router-builder:latest AS builder
+FROM registry.fk.jochum.dev/jo-micro/builder:latest AS builder
 
 # Create appuser (/etc/passwd entry for the runner container)
 RUN useradd appuser
 
-VOLUME [ "/go", "/code" ]
+VOLUME [ "/go" ]
 
 WORKDIR /code
 
 # RUN go mod download
 ENV GOPATH="/go"
 
-ARG CACHEBUST=1
 ARG VERSION
+COPY . /code/
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -installsuffix cgo -ldflags="-w -s -X 'jochum.dev/jo-micro/router/internal/config.Version=$VERSION'" -o /usr/local/bin/microrouterd jochum.dev/jo-micro/router/cmd/microrouterd
 
 # STEP 2 build a small image