tools image

.drone.yml

@@ -7,11 +7,6 @@ trigger:
     - push
 
 steps:
-  - name: Checker
-    image: vdhsn/tools
-    commands:
-      - ls -lash
-
   - name: Build & Publish Catalog
     image: plugins/kaniko
     settings:

Makefile

@@ -52,6 +52,20 @@ VERSION = $(shell git rev-parse --verify --short HEAD)
 GIT_REF = $(shell git rev-parse --verify HEAD)
 BUILD_DATE := $(shell date +%Y-%m-%d-%T)
 
+.PHONY: build-tools-image
+build-tools-image:
+	@docker build \
+		--label 'com.barretthousen.version=$(VERSION)' \
+		--label 'com.barretthousen.git-ref=$(GIT_REF)' \
+		--label 'com.barretthousen.build-date=$(BUILD_DATE)' \
+		--label 'com.barrethousen.builder=$(BUILD_INITIATOR)' \
+		-t git.vdhsn.com/barretthousen/tools):$(VERSION) \
+		-t git.vdhsn.com/barretthousen/tools):v1 \
+		-f ./src/Dockerfile.tools ./src
+
+    @docker push git.vdhsn.com/barretthousen/tools:$(VERSION)
+	@docker push git.vdhsn.com/barretthousen/tools:v1
+
 .PHONY: build-client-image
 build-client-image:
 	@docker build --target=production \

src/Dockerfile.prod-backend

@@ -1,7 +1,4 @@
-FROM golang:1.19 as prod-builder
-
-RUN go install github.com/bufbuild/buf/cmd/buf@v1.17.0
-RUN go install github.com/kyleconroy/sqlc/cmd/sqlc@latest
+FROM git.vdhsn.com/barretthousen/tools:v1 as prod-builder
 
 COPY . /go/src
 

src/Dockerfile.tools

@@ -0,0 +1,4 @@
+FROM golang:1.19 
+
+RUN go install github.com/bufbuild/buf/cmd/buf@v1.17.0
+RUN go install github.com/kyleconroy/sqlc/cmd/sqlc@latest