Skip to content

Commit

Permalink
Merge branch 'master' into update-alpine
Browse files Browse the repository at this point in the history
  • Loading branch information
tomciopp authored Nov 16, 2022
2 parents 6abb905 + f936679 commit 244c62e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ARG ERLANG_VERSION
# is updated with the current date. It will force refresh of all
# of the base images and things like `apt-get update` won't be using
# old cached versions when the Dockerfile is built.
ENV REFRESHED_AT=2022-11-16 \
ENV REFRESHED_AT=2022-08-30 \
LANG=C.UTF-8 \
HOME=/opt/app/ \
TERM=xterm \
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ build: setup-buildx ## Build the Docker image
--build-arg ALPINE_MIN_VERSION=$(ALPINE_MIN_VERSION) \
--cache-from "type=local,src=$(BUILDX_CACHE_DIR)" \
--cache-to "type=local,dest=$(BUILDX_CACHE_DIR)" \
--platform linux/amd64,linux/arm64 \
--platform linux/amd64 \
-t $(IMAGE_NAME):$(VERSION) \
-t $(IMAGE_NAME):$(MIN_VERSION) \
-t $(IMAGE_NAME):$(MAJ_VERSION) $(EXTRA_TAGS) .
Expand Down Expand Up @@ -102,7 +102,7 @@ release: setup-buildx ## Build and release the Docker image to Docker Hub
--build-arg ERLANG_VERSION=$(VERSION) \
--build-arg ALPINE_VERSION=$(ALPINE_VERSION) \
--build-arg ALPINE_MIN_VERSION=$(ALPINE_MIN_VERSION) \
--platform linux/amd64,linux/arm64 \
--platform linux/amd64 \
--cache-from "type=local,src=$(BUILDX_CACHE_DIR)" \
--cache-to "type=local,dest=$(BUILDX_CACHE_DIR)" \
-t $(IMAGE_NAME):$(VERSION) \
Expand Down

0 comments on commit 244c62e

Please sign in to comment.