From aa19e7d5b5d98d3011253c64d9c37f137a0239b9 Mon Sep 17 00:00:00 2001 From: Beta Ziliani Date: Fri, 17 Feb 2023 11:39:37 -0300 Subject: [PATCH 1/2] Bugfix: comments in variables values create spaces --- docker/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docker/Makefile b/docker/Makefile index 152a48d8..1f53c3a1 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -10,8 +10,10 @@ CRYSTAL_VERSION ?= ## How the binaries should be branded CRYSTAL_DEB ?= ## Which crystal.deb file to install in debian based docker images (ubuntu32) CRYSTAL_TARGZ ?= ## Which crystal.tar.gz file to install in docker images (ubuntu64, alpine) -DOCKER_TAG ?= $(CRYSTAL_VERSION) ## How to tag the docker image (examples: `0.27.2`, `nightly20190307`). `-build` will be appended for build images. -DOCKER_REPOSITORY ?= crystallang/crystal ## Docker hub repository to commit image +## How to tag the docker image (examples: `0.27.2`, `nightly20190307`). `-build` will be appended for build images. +DOCKER_TAG ?= $(CRYSTAL_VERSION) +## Docker hub repository to commit image +DOCKER_REPOSITORY ?= crystallang/crystal GC_VERSION = v8.2.0 From b8565894cc68c8edb3931e25101c93338b630401 Mon Sep 17 00:00:00 2001 From: Beta Ziliani Date: Mon, 27 Feb 2023 14:21:04 -0300 Subject: [PATCH 2/2] Update docker/Makefile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Johannes Müller --- docker/Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/docker/Makefile b/docker/Makefile index 1f53c3a1..8a5e4971 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -10,10 +10,9 @@ CRYSTAL_VERSION ?= ## How the binaries should be branded CRYSTAL_DEB ?= ## Which crystal.deb file to install in debian based docker images (ubuntu32) CRYSTAL_TARGZ ?= ## Which crystal.tar.gz file to install in docker images (ubuntu64, alpine) -## How to tag the docker image (examples: `0.27.2`, `nightly20190307`). `-build` will be appended for build images. -DOCKER_TAG ?= $(CRYSTAL_VERSION) -## Docker hub repository to commit image -DOCKER_REPOSITORY ?= crystallang/crystal + +DOCKER_TAG ?= $(CRYSTAL_VERSION)## How to tag the docker image (examples: `0.27.2`, `nightly20190307`). `-build` will be appended for build images. +DOCKER_REPOSITORY ?= crystallang/crystal## Docker hub repository to commit image GC_VERSION = v8.2.0