From b265c5fcc8f27a142e9de013b384f54600faef34 Mon Sep 17 00:00:00 2001 From: "Brian J. Cardiff" Date: Thu, 8 Mar 2018 12:37:43 -0300 Subject: [PATCH 1/2] Add -linux- suffix to .tar.* generated files --- linux/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/Makefile b/linux/Makefile index 9f8a8dec..1f45ef79 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -24,7 +24,7 @@ LIBATOMIC_OPS_VERSION = v7.4.10 LIBEVENT_VERSION = release-2.1.8-stable OUTPUT_DIR = build -OUTPUT_BASENAME = $(OUTPUT_DIR)/crystal-$(CRYSTAL_VERSION)-$(PACKAGE_ITERATION)-x86_64 +OUTPUT_BASENAME = $(OUTPUT_DIR)/crystal-$(CRYSTAL_VERSION)-$(PACKAGE_ITERATION)-linux-x86_64 FILES = files/crystal-wrapper DEB_NAME = crystal_$(CRYSTAL_VERSION)-$(PACKAGE_ITERATION)_amd64.deb From 58834cd856ce55824fb223ebbc9dc801c43697a4 Mon Sep 17 00:00:00 2001 From: "Brian J. Cardiff" Date: Sat, 10 Mar 2018 00:00:31 -0300 Subject: [PATCH 2/2] Change from `bash` to `sh` in nightly docker image Ref: crystal-lang/crystal#5468 --- docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 51a2e1ae..1256e770 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -13,7 +13,7 @@ COPY ${crystal_deb} /tmp/crystal.deb # nightly packages do not have valid version numbers RUN dpkg --force-bad-version -i /tmp/crystal.deb -CMD ["/bin/bash"] +CMD ["/bin/sh"] FROM runtime as build @@ -24,4 +24,4 @@ RUN \ ENV LIBRARY_PATH=/usr/lib/crystal/lib/ -CMD ["/bin/bash"] +CMD ["/bin/sh"]