Skip to content

Commit e9c7faf

Browse files
authored
Merge pull request #22 from Cryptophobia/master
chore(Makefile) upgrading go-dev container to v1.28.3
2 parents b89e1c9 + 793ab0a commit e9c7faf

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ export GO15VENDOREXPERIMENT=1
55
# Note that Minio currently uses CGO.
66

77
LDFLAGS := "-s -X main.version=${VERSION}"
8-
IMAGE_PREFIX ?= deis
8+
IMAGE_PREFIX ?= hephy
99
BINDIR := ./rootfs/bin
1010

1111
include versioning.mk
@@ -14,7 +14,7 @@ SHELL_SCRIPTS = $(wildcard _scripts/*.sh) $(wildcard rootfs/bin/*_object) $(wild
1414

1515
# The following variables describe the containerized development environment
1616
# and other build options
17-
DEV_ENV_IMAGE := quay.io/deis/go-dev:0.20.0
17+
DEV_ENV_IMAGE := hephy/go-dev:v1.28.3
1818
DEV_ENV_WORK_DIR := /go/src/${REPO_PATH}
1919
DEV_ENV_CMD := docker run --rm -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR} ${DEV_ENV_IMAGE}
2020
DEV_ENV_CMD_INT := docker run -it --rm -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR} ${DEV_ENV_IMAGE}

rootfs/builder/build.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ mkdir -p $secret_dir
2424
mkdir -p $buildpack_root
2525
mkdir -p $build_root/.profile.d
2626

27-
if ! [[ -z "${TAR_PATH}" ]]; then
27+
if [[ -n "${TAR_PATH}" ]]; then
2828
get_object
2929
tar -xzf /tmp/slug.tgz -C /app/
3030
unset TAR_PATH
@@ -67,7 +67,7 @@ function cache_fingerprint() {
6767
}
6868

6969
# Restore cache when a $CACHE_PATH was supplied
70-
if ! [[ -z "${CACHE_PATH}" ]]; then
70+
if [[ -n "${CACHE_PATH}" ]]; then
7171
echo_title "Restoring cache..."
7272
restore_cache
7373
if [[ -f ${cache_file} ]]; then
@@ -122,7 +122,7 @@ fi
122122

123123
## Buildpack detection
124124

125-
buildpacks=($buildpack_root/*)
125+
buildpacks=("$buildpack_root/*")
126126
selected_buildpack=
127127

128128
if [[ -n "$BUILDPACK_URL" ]]; then
@@ -228,7 +228,7 @@ if [[ ! -f "$build_root/Procfile" ]]; then
228228
fi
229229

230230
# Compress and save cache
231-
if ! [[ -z "${CACHE_PATH}" ]]; then
231+
if [[ -n "${CACHE_PATH}" ]]; then
232232
echo_title "Checking for changes inside the cache directory..."
233233
# If there's any files in the cache_root folder, we'll create a tar and upload
234234
# it for future use

0 commit comments

Comments
 (0)