Merge pull request #42 from josejulio/add-build-to-docker

Adds build flag to compose calls to prevent stale executions

Dockerfile

@@ -11,11 +11,19 @@ RUN ln -s /usr/local/go/bin/go /usr/local/bin/go
 
 WORKDIR /workspace
 
-COPY . ./
+COPY go.mod go.sum ./
 
 ENV CGO_ENABLED 1
-RUN go mod vendor
-RUN make build
+RUN go mod download
+
+COPY api ./api
+COPY cmd ./cmd
+COPY internal ./internal
+COPY third_party ./third_party
+COPY main.go Makefile ./
+
+ARG VERSION
+RUN VERSION=${VERSION} make build
 
 FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10
 

Makefile

@@ -8,7 +8,9 @@ endif
 API_PROTO_FILES:=$(shell find api -name *.proto)
 
 TITLE:="Kessel Asset Inventory API"
+ifeq ($(VERSION),)
 VERSION:=$(shell git describe --tags --always)
+endif
 INVENTORY_SCHEMA_VERSION=0.11.0
 
 .PHONY: init

docker-compose.yaml

@@ -8,6 +8,8 @@ services:
 #      - "INVENTORY_API_STORAGE_POSTGRES_PASSWORD=${POSTGRES_PASSWORD}"
     build:
       dockerfile: Dockerfile
+      args:
+        VERSION: dev
     volumes:
       - ./inventory-api-compose.yaml:/inventory-api-compose.yaml:ro,z
       - ./config/psks.yaml:/psks.yaml:ro,z
@@ -22,6 +24,8 @@ services:
       INVENTORY_API_CONFIG: /inventory-api-compose.yaml
     build:
       dockerfile: Dockerfile
+      args:
+        VERSION: dev
     volumes:
       - ./inventory-api-compose.yaml:/inventory-api-compose.yaml:ro,z
     command: ["migrate"]

scripts/start-inventory-kc.sh

@@ -2,4 +2,4 @@
 set -e
 # Function to check if a command is available
 source ./scripts/check_docker_podman.sh
-${DOCKER} compose --env-file ./scripts/.env -f ./docker-compose-sso.yaml up -d
+${DOCKER} compose --env-file ./scripts/.env -f ./docker-compose-sso.yaml up -d --build

scripts/start-inventory.sh

@@ -2,4 +2,4 @@
 set -e
 # Function to check if a command is available
 source ./scripts/check_docker_podman.sh
-${DOCKER} compose --env-file ./scripts/.env -f ./docker-compose.yaml up -d
+${DOCKER} compose --env-file ./scripts/.env -f ./docker-compose.yaml up -d --build