diff options
| -rw-r--r-- | Dockerfile | 15 | ||||
| -rw-r--r-- | Makefile | 48 |
2 files changed, 37 insertions, 26 deletions
@@ -1,14 +1,19 @@ -FROM golang:1.13-alpine3.10 as build -ENV GO111MODULE=on +ARG BASE_IMAGE_ARCH="amd64" +ARG ALPINE_LINUX_VERSION="3.11" + +FROM golang:1-alpine${ALPINE_LINUX_VERSION} as build +ARG APP_VERSION +ARG APP_ARCH="amd64" WORKDIR /go/src/app RUN apk add --no-cache --update build-base git COPY . . -RUN make linux-__MINIFLUX_ARCH__ VERSION=__MINIFLUX_VERSION__ +RUN make linux-${APP_ARCH} VERSION=${APP_VERSION} +RUN cp /go/src/app/miniflux-linux-${APP_ARCH} /go/src/app/miniflux -FROM __BASEIMAGE_ARCH__/alpine:3.10.3 +FROM ${BASE_IMAGE_ARCH}/alpine:${ALPINE_LINUX_VERSION} EXPOSE 8080 ENV LISTEN_ADDR 0.0.0.0:8080 RUN apk --no-cache add ca-certificates tzdata -COPY --from=build /go/src/app/miniflux-linux-__MINIFLUX_ARCH__ /usr/bin/miniflux +COPY --from=build /go/src/app/miniflux /usr/bin/miniflux USER nobody CMD ["/usr/bin/miniflux"] @@ -120,29 +120,35 @@ clean-integration-test: @ psql -U postgres -c 'drop database if exists miniflux_test;' docker-image: - cp Dockerfile Dockerfile.amd64 - sed -i.bak "s/__BASEIMAGE_ARCH__/amd64/" Dockerfile.amd64 - sed -i.bak "s/__MINIFLUX_VERSION__/$(VERSION)/" Dockerfile.amd64 - sed -i.bak "s/__MINIFLUX_ARCH__/amd64/" Dockerfile.amd64 - docker build --pull -f Dockerfile.amd64 -t $(DOCKER_IMAGE):$(VERSION) . - rm -f Dockerfile.amd64* + docker build -t $(DOCKER_IMAGE):$(VERSION) \ + --build-arg APP_VERSION=$(VERSION) \ + --build-arg APP_ARCH=amd64 \ + --build-arg BASE_IMAGE_ARCH=amd64 . docker-images: - for arch in amd64 arm32v6 arm32v7 arm64v8; do \ - case $${arch} in \ - amd64 ) miniflux_arch="amd64";; \ - arm32v6 ) miniflux_arch="armv6";; \ - arm32v7 ) miniflux_arch="armv7";; \ - arm64v8 ) miniflux_arch="armv8";; \ - esac ;\ - cp Dockerfile Dockerfile.$${arch} && \ - sed -i"" -e "s|__BASEIMAGE_ARCH__|$${arch}|g" Dockerfile.$${arch} && \ - sed -i"" -e "s|__MINIFLUX_VERSION__|$(VERSION)|g" Dockerfile.$${arch} && \ - sed -i"" -e "s|__MINIFLUX_ARCH__|$${miniflux_arch}|g" Dockerfile.$${arch} && \ - docker build --pull -f Dockerfile.$${arch} -t $(DOCKER_IMAGE):$${arch}-$(VERSION) . && \ - docker tag $(DOCKER_IMAGE):$${arch}-${VERSION} $(DOCKER_IMAGE):$${arch}-latest && \ - rm -f Dockerfile.$${arch}* ;\ - done + docker build -t $(DOCKER_IMAGE):amd64-$(VERSION) \ + --build-arg APP_VERSION=$(VERSION) \ + --build-arg APP_ARCH=amd64 \ + --build-arg BASE_IMAGE_ARCH=amd64 . + docker tag $(DOCKER_IMAGE):amd64-$(VERSION) $(DOCKER_IMAGE):amd64-latest + + docker build -t $(DOCKER_IMAGE):arm32v6-$(VERSION) \ + --build-arg APP_VERSION=$(VERSION) \ + --build-arg APP_ARCH=armv6 \ + --build-arg BASE_IMAGE_ARCH=arm32v6 . + docker tag $(DOCKER_IMAGE):arm32v6-$(VERSION) $(DOCKER_IMAGE):arm32v6-latest + + docker build -t $(DOCKER_IMAGE):arm32v7-$(VERSION) \ + --build-arg APP_VERSION=$(VERSION) \ + --build-arg APP_ARCH=armv7 \ + --build-arg BASE_IMAGE_ARCH=arm32v7 . + docker tag $(DOCKER_IMAGE):arm32v7-$(VERSION) $(DOCKER_IMAGE):arm32v7-latest + + docker build -t $(DOCKER_IMAGE):arm64v8-$(VERSION) \ + --build-arg APP_VERSION=$(VERSION) \ + --build-arg APP_ARCH=armv8 \ + --build-arg BASE_IMAGE_ARCH=arm64v8 . + docker tag $(DOCKER_IMAGE):arm64v8-$(VERSION) $(DOCKER_IMAGE):arm64v8-latest docker-manifest: for version in $(VERSION) latest; do \ |