Dockerfile Rework

Dockerfile

@@ -1,54 +1,90 @@
-FROM golang:1.24.1-alpine as base
+ARG CONTEXT=prod
+ARG GO_IMAGE_VERSION=1.24.3
+ARG ALPINE_VERSION=3
+
+FROM golang:${GO_IMAGE_VERSION}-alpine as base
+
+## Setup
+ARG CONTEXT
+ARG GO_IMAGE_VERSION
 WORKDIR /root/openslides-search-service
+ENV ${CONTEXT}=1
+
 
-RUN apk add git
+## Installs
+RUN apk add git --no-cache
 
 COPY go.mod go.sum ./
 RUN go mod download
 
 COPY cmd cmd
 COPY pkg pkg
 
-# Build service in seperate stage.
-FROM base as builder
-RUN go build -o openslides-search-service cmd/searchd/main.go
-
-
-# Test build.
-FROM base as testing
+## External Information
+LABEL org.opencontainers.image.title="OpenSlides Search Service"
+LABEL org.opencontainers.image.description="The Search Service is a http endpoint where the clients can search for data within Openslides."
+LABEL org.opencontainers.image.licenses="MIT"
+LABEL org.opencontainers.image.source="https://github.com/OpenSlides/openslides-search-service"
 
-RUN apk add build-base
+EXPOSE 9050
 
-CMD go vet ./... && go test -test.short ./...
+## Command
+COPY ./dev/command.sh ./
+RUN chmod +x command.sh
+CMD ["./command.sh"]
 
 
-# Development build.
-FROM base as development
+# Development Image
+FROM base as dev
 
 RUN ["go", "install", "github.com/githubnemo/CompileDaemon@latest"]
-EXPOSE 9050
 
 WORKDIR /root
 COPY entrypoint.sh ./
 COPY meta/search.yml .
 COPY meta/models.yml .
+
+## Command
 ENTRYPOINT ["./entrypoint.sh"]
 
-CMD CompileDaemon -log-prefix=false -build="go build -o search-service ./openslides-search-service/cmd/searchd/main.go" -command="./search-service"
 
 
-# Productive build
-FROM alpine:3
+# Testing Image
+FROM base as tests
+
+RUN apk add build-base --no-cache
 
-LABEL org.opencontainers.image.title="OpenSlides Search Service"
-LABEL org.opencontainers.image.description="The Search Service is a http endpoint where the clients can search for data within Openslides."
-LABEL org.opencontainers.image.licenses="MIT"
-LABEL org.opencontainers.image.source="https://github.com/OpenSlides/openslides-search-service"
+
+
+
+
+# Production Image
+FROM base as builder
+RUN go build -o openslides-search-service cmd/searchd/main.go
+
+
+FROM alpine:3 as prod
+
+ARG CONTEXT
+
+WORKDIR /
 
 COPY entrypoint.sh ./
 COPY meta/search.yml .
 COPY meta/models.yml .
 COPY --from=builder /root/openslides-search-service/openslides-search-service .
+
+## External Information
+LABEL org.opencontainers.image.title="OpenSlides Search Service"
+LABEL org.opencontainers.image.description="The Search Service is a http endpoint where the clients can search for data within Openslides."
+LABEL org.opencontainers.image.licenses="MIT"
+LABEL org.opencontainers.image.source="https://github.com/OpenSlides/openslides-search-service"
+
 EXPOSE 9050
-ENTRYPOINT ["./entrypoint.sh"]
-CMD exec ./openslides-search-service
+
+## Command
+ENV ${CONTEXT}=1
+COPY ./dev/command.sh ./
+RUN chmod +x command.sh
+CMD ["./command.sh"]
+ENTRYPOINT ["./entrypoint.sh"]

Makefile

@@ -1,9 +1,16 @@
+SERVICE=search 
+
 build-dev:
-	docker build . --target development --tag openslides-search-dev
+	bash ../dev/scripts/makefile/build-service.sh $(SERVICE) dev
+
+build-prod:
+	bash ../dev/scripts/makefile/build-service.sh $(SERVICE) prod
+
+build-test:
+	bash ../dev/scripts/makefile/build-service.sh $(SERVICE) tests
 
 run-tests:
-	docker build . --target testing --tag openslides-search-test
-	docker run openslides-search-test
+	bash dev/run-tests.sh
 
 all: gofmt gotest golinter
 

dev/command.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+if [ ! -z $dev   ]; then CompileDaemon -log-prefix=false -build="go build -o search-service ./openslides-search-service/cmd/searchd/main.go" -command="./search-service"; fi
+if [ ! -z $tests ]; then go vet ./... && go test -test.short ./...; fi
+if [ ! -z $prod  ]; then exec ./openslides-search-service; fi

dev/run-tests.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+# Executes all tests. Should errors occur, CATCH will be set to 1, causing an erronous exit code.
+
+echo "########################################################################"
+echo "###################### Start full system tests #########################"
+echo "########################################################################"
+
+IMAGE_TAG=openslides-search-tests
+CATCH=0
+PERSIST_CONTAINERS=$1
+
+make build-test || CATCH=1
+docker run ${IMAGE_TAG} || CATCH=1
+
+if [ -z $PERSIST_CONTAINERS ]; then docker stop $(docker ps -a -q --filter ancestor=${IMAGE_TAG} --format="{{.ID}}") || CATCH=1; fi
+
+exit $CATCH