fixing dockerfile

Author: roi-codefresh

Dockerfile

@@ -15,34 +15,19 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
-ARG GO_VERSION=1.19.4
+ARG GO_VERSION=1.19.4-alpine
 ARG XX_VERSION=1.1.2
 ARG GOLANGCI_LINT_VERSION=v1.49.0
 ARG ADDLICENSE_VERSION=v1.0.0
 
-ARG BUILD_TAGS="e2e,kube"
-ARG DOCS_FORMATS="md,yaml"
-ARG LICENSE_FILES=".*\(Dockerfile\|Makefile\|\.go\|\.hcl\|\.sh\)"
-
-# xx is a helper for cross-compilation
-FROM --platform=${BUILDPLATFORM} tonistiigi/xx:${XX_VERSION} AS xx
-
-FROM golangci/golangci-lint:${GOLANGCI_LINT_VERSION}-alpine AS golangci-lint
-FROM ghcr.io/google/addlicense:${ADDLICENSE_VERSION} AS addlicense
-
-FROM --platform=${BUILDPLATFORM} golang:${GO_VERSION}-alpine AS base
-COPY --from=xx / /
-RUN apk add --no-cache \
-  docker \
-  file \
+FROM --platform=${BUILDPLATFORM} golang:${GO_VERSION} AS base
+WORKDIR /compose-cli
+RUN apk add --no-cache -vv \
   git \
+  docker \
   make \
   protoc \
   protobuf-dev
-WORKDIR /src
-ENV CGO_ENABLED=0
-
-FROM base AS build-base
 COPY go.* .
 RUN --mount=type=cache,target=/go/pkg/mod \
   --mount=type=cache,target=/root/.cache/go-build \
@@ -52,19 +37,33 @@ FROM base AS make-compose-plugin
 ENV CGO_ENABLED=0
 ARG TARGETOS
 ARG TARGETARCH
-ARG TARGETVARIANT
-RUN --mount=from=binary \
-  mkdir -p /out && \
-  # TODO: should just use standard arch
-  TARGETARCH=$([ "$TARGETARCH" = "amd64" ] && echo "x86_64" || echo "$TARGETARCH"); \
-  TARGETARCH=$([ "$TARGETARCH" = "arm64" ] && echo "aarch64" || echo "$TARGETARCH"); \
-  cp docker-compose* "/out/docker-compose-${TARGETOS}-${TARGETARCH}${TARGETVARIANT}$(ls docker-compose* | sed -e 's/^docker-compose//')"
+ARG BUILD_TAGS
+ARG GIT_TAG
+RUN --mount=target=. \
+  --mount=type=cache,target=/go/pkg/mod \
+  --mount=type=cache,target=/root/.cache/go-build \
+  GOOS=${TARGETOS} \
+  GOARCH=${TARGETARCH} \
+  BUILD_TAGS=${BUILD_TAGS} \
+  GIT_TAG=${GIT_TAG} \
+  make COMPOSE_BINARY=/out/docker-compose -f builder.Makefile compose-plugin
 
 FROM debian:bullseye-slim AS compose-plugin
-WORKDIR /root
+
 COPY --from=make-compose-plugin /out/* /usr/local/bin/
+# add user
+RUN addgroup --gid 3000 compose && \
+  adduser --uid 3000 --gecos "" --disabled-password \
+  --ingroup compose \
+  --home /home/compose \
+  --shell /bin/bash compose
+
+WORKDIR /home/compose
+
+RUN chown -R compose:compose /home/compose && \
+  chmod 755 /home/compose
+
 
-RUN adduser --gecos "" --disabled-password --home /home/cfu --shell /bin/bash cfu
-USER cfu
+USER compose:compose
 
 ENTRYPOINT [ "docker-compose" ]

builder.Makefile

@@ -0,0 +1,72 @@
+#   Copyright 2020 Docker Compose CLI authors
+
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+
+#       http://www.apache.org/licenses/LICENSE-2.0
+
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+GOOS?=$(shell go env GOOS)
+GOARCH?=$(shell go env GOARCH)
+
+PKG_NAME := github.com/docker/compose/v2
+
+EXTENSION:=
+ifeq ($(GOOS),windows)
+  EXTENSION:=.exe
+endif
+
+STATIC_FLAGS=CGO_ENABLED=0
+
+GIT_TAG?=$(shell git describe --tags --match "v[0-9]*")
+
+LDFLAGS="-s -w -X $(PKG_NAME)/internal.Version=${GIT_TAG}"
+GO_BUILD=$(STATIC_FLAGS) go build -trimpath -ldflags=$(LDFLAGS)
+
+COMPOSE_BINARY?=bin/docker-compose
+COMPOSE_BINARY_WITH_EXTENSION=$(COMPOSE_BINARY)$(EXTENSION)
+
+WORK_DIR:=$(shell mktemp -d)
+
+TAGS:=
+ifdef BUILD_TAGS
+  TAGS=-tags $(BUILD_TAGS)
+  LINT_TAGS=--build-tags $(BUILD_TAGS)
+endif
+
+.PHONY: compose-plugin
+compose-plugin:
+	GOOS=${GOOS} GOARCH=${GOARCH} $(GO_BUILD) $(TAGS) -o $(COMPOSE_BINARY_WITH_EXTENSION) ./cmd
+
+.PHONY: cross
+cross:
+	GOOS=linux   GOARCH=amd64 $(GO_BUILD) $(TAGS) -o $(COMPOSE_BINARY)-linux-x86_64 ./cmd
+	GOOS=linux   GOARCH=arm64 $(GO_BUILD) $(TAGS) -o $(COMPOSE_BINARY)-linux-aarch64 ./cmd
+	GOOS=linux   GOARM=6 GOARCH=arm $(GO_BUILD) $(TAGS) -o $(COMPOSE_BINARY)-linux-armv6 ./cmd
+	GOOS=linux   GOARM=7 GOARCH=arm $(GO_BUILD) $(TAGS) -o $(COMPOSE_BINARY)-linux-armv7 ./cmd
+	GOOS=linux   GOARCH=s390x $(GO_BUILD) $(TAGS) -o $(COMPOSE_BINARY)-linux-s390x ./cmd
+	GOOS=darwin  GOARCH=amd64 $(GO_BUILD) $(TAGS) -o $(COMPOSE_BINARY)-darwin-x86_64 ./cmd
+	GOOS=darwin  GOARCH=arm64 $(GO_BUILD) $(TAGS) -o $(COMPOSE_BINARY)-darwin-aarch64 ./cmd
+	GOOS=windows GOARCH=amd64 $(GO_BUILD) $(TAGS) -o $(COMPOSE_BINARY)-windows-x86_64.exe ./cmd
+
+.PHONY: test
+test:
+	go test $(TAGS) -cover $(shell go list  $(TAGS) ./... | grep -vE 'e2e')
+
+.PHONY: lint
+lint:
+	golangci-lint run $(LINT_TAGS) --timeout 10m0s ./...
+
+.PHONY: check-license-headers
+check-license-headers:
+	./scripts/validate/fileheader
+
+.PHONY: check-go-mod
+check-go-mod:
+	./scripts/validate/check-go-mod

service.yaml

@@ -1 +1 @@
-version: 1.2.9
+version: 1.3.0