aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Frédéric Guillot <fred@miniflux.net>2019-11-26 22:22:55 -0800
committerGravatar Frédéric Guillot <fred@miniflux.net>2019-11-26 23:00:17 -0800
commitbacab20f4a9b5b3374a3f15923edd102b9a4b24f (patch)
tree6bfd9e73de2e8c2dca35123f37711ffdcc4837e5
parent7b995044b48e0c18a6b345f6d784191ac97ad264 (diff)
Add Makefile target to build only amd64 Docker image
-rw-r--r--Dockerfile2
-rw-r--r--Makefile9
2 files changed, 10 insertions, 1 deletions
diff --git a/Dockerfile b/Dockerfile
index 439ef8f..da33ff1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@ RUN apk add --no-cache --update build-base git
COPY . .
RUN make linux-__MINIFLUX_ARCH__ VERSION=__MINIFLUX_VERSION__
-FROM __BASEIMAGE_ARCH__/alpine:3.10.1
+FROM __BASEIMAGE_ARCH__/alpine:3.10.3
EXPOSE 8080
ENV LISTEN_ADDR 0.0.0.0:8080
RUN apk --no-cache add ca-certificates tzdata
diff --git a/Makefile b/Makefile
index 4ffbfcf..8470a2a 100644
--- a/Makefile
+++ b/Makefile
@@ -33,6 +33,7 @@ export GO111MODULE=on
lint \
integration-test \
clean-integration-test \
+ docker-image \
docker-images \
docker-manifest
@@ -118,6 +119,14 @@ clean-integration-test:
@ rm miniflux-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-images:
for arch in amd64 arm32v6 arm32v7 arm64v8; do \
case $${arch} in \