volker.raschek
/
getidev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: define images in Dockerfile
continuous-integration/drone/push Build is failing Details

This commit is contained in:
Markus Pesch 2024-04-08 16:22:22 +02:00
parent 0298a6a2bf
commit ba74445c54
Signed by: volker.raschek
GPG Key ID: 852BCC170D81A982
2 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Dockerfile
View File

@ -1,9 +1,4 @@
ARG BASE_IMAGE
ARG BUILD_IMAGE
# BUILD
# =====================================================================
FROM ${BUILD_IMAGE} AS build
FROM docker.io/library/golang:1.21.6-alpine3.18
ARG VERSION
@ -15,7 +10,7 @@ RUN cd /workspace && \
# TARGET
# =====================================================================
FROM ${BASE_IMAGE}
FROM docker.io/library/alpine:3.19
COPY --from=build /workspace/getidev /usr/bin/getidev

14
Makefile
View File

@ -4,18 +4,6 @@ VERSION?=$(shell git describe --abbrev=0)+hash.$(shell git rev-parse --short HEA
# CONTAINER_RUNTIME
CONTAINER_RUNTIME?=$(shell which podman)
# BUILD_IMAGE
BUILD_IMAGE_REGISTRY_HOST?=docker.io
BUILD_IMAGE_REPOSITORY=library/golang
BUILD_IMAGE_VERSION?=1.16
BUILD_IMAGE_FULLY_QUALIFIED:=${BUILD_IMAGE_REGISTRY_HOST}/${BUILD_IMAGE_REPOSITORY}:${BUILD_IMAGE_VERSION}
# BASE_IMAGE
BASE_IMAGE_REGISTRY_HOST?=docker.io
BASE_IMAGE_REPOSITORY=library/busybox
BASE_IMAGE_VERSION?=latest
BASE_IMAGE_FULLY_QUALIFIED=${BASE_IMAGE_REGISTRY_HOST}/${BASE_IMAGE_REPOSITORY}:${BASE_IMAGE_VERSION}
# CONTAINER_IMAGE
CONTAINER_IMAGE_REGISTRY_HOST?=docker.io
CONTAINER_IMAGE_REPOSITORY=volkerraschek/getidev
@ -55,8 +43,6 @@ gosec:
PHONY+=container-image/build
container-image/build:
${CONTAINER_RUNTIME} build \
--build-arg BASE_IMAGE=${BASE_IMAGE_FULLY_QUALIFIED} \
--build-arg BUILD_IMAGE=${BUILD_IMAGE_FULLY_QUALIFIED} \
--build-arg VERSION=${VERSION} \
--file ./Dockerfile \
--no-cache \