Skip to content

Commit

Permalink
Merge pull request #22 from Cryptophobia/master
Browse files Browse the repository at this point in the history 
chore(Makefile) upgrading go-dev container to v1.28.3
  • Loading branch information
@Cryptophobia
Cryptophobia authored Oct 8, 2020
2 parents b89e1c9 + 793ab0a commit e9c7faf
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export GO15VENDOREXPERIMENT=1
# Note that Minio currently uses CGO.

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

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

# The following variables describe the containerized development environment
# and other build options
DEV_ENV_IMAGE := quay.io/deis/go-dev:0.20.0
DEV_ENV_IMAGE := hephy/go-dev:v1.28.3
DEV_ENV_WORK_DIR := /go/src/${REPO_PATH}
DEV_ENV_CMD := docker run --rm -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR} ${DEV_ENV_IMAGE}
DEV_ENV_CMD_INT := docker run -it --rm -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR} ${DEV_ENV_IMAGE}
Expand Down
8 changes: 4 additions & 4 deletions rootfs/builder/build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ mkdir -p $secret_dir
mkdir -p $buildpack_root
mkdir -p $build_root/.profile.d

if ! [[ -z "${TAR_PATH}" ]]; then
if [[ -n "${TAR_PATH}" ]]; then
get_object
tar -xzf /tmp/slug.tgz -C /app/
unset TAR_PATH
Expand Down Expand Up @@ -67,7 +67,7 @@ function cache_fingerprint() {
}

# Restore cache when a $CACHE_PATH was supplied
if ! [[ -z "${CACHE_PATH}" ]]; then
if [[ -n "${CACHE_PATH}" ]]; then
echo_title "Restoring cache..."
restore_cache
if [[ -f ${cache_file} ]]; then
Expand Down Expand Up @@ -122,7 +122,7 @@ fi

## Buildpack detection

buildpacks=($buildpack_root/*)
buildpacks=("$buildpack_root/*")

This comment has been minimized.

Sign in to view

Copy link
@n0n0x

n0n0x Dec 10, 2020 •
edited
Loading

Contributor

This breaks build detection:

$ git push deis master
Enumerating objects: 964, done.
Counting objects: 100% (964/964), done.
Delta compression using up to 8 threads
Compressing objects: 100% (601/601), done.
Writing objects: 100% (964/964), 177.31 KiB | 10.43 MiB/s, done.
Total 964 (delta 576), reused 573 (delta 340), pack-reused 0
remote: Resolving deltas: 100% (576/576), done.
Starting build... but first, coffee!
...
...
-----> Restoring cache...
       No cache file found. If this is the first deploy, it will be created now.
/builder/build.sh: line 162: /tmp/buildpacks/*/bin/detect: No such file or directory
-----> Unable to select a buildpack

slug@78a0f0b805eb:~$ buildpacks=($buildpack_root/*)
slug@78a0f0b805eb:~$ for buildpack in "${buildpacks[@]}"; do   echo "- $buildpack"; done
- /tmp/buildpacks/01-multi
- /tmp/buildpacks/02-clojure
- /tmp/buildpacks/03-go
- /tmp/buildpacks/04-gradle
- /tmp/buildpacks/05-grails
- /tmp/buildpacks/06-java
- /tmp/buildpacks/07-nodejs
- /tmp/buildpacks/08-php
- /tmp/buildpacks/09-play
- /tmp/buildpacks/10-python
- /tmp/buildpacks/11-ruby
- /tmp/buildpacks/12-scala


slug@78a0f0b805eb:~$ buildpacks=("$buildpack_root/*")
slug@78a0f0b805eb:~$ for buildpack in "${buildpacks[@]}"; do   echo "- $buildpack"; done
- /tmp/buildpacks/*
slug@78a0f0b805eb:~$

This comment has been minimized.

Sign in to view

Copy link
@Cryptophobia

Cryptophobia Dec 11, 2020

Author Member

Nice find! Was not sure what made the buildpack detection break but this is it!
selected_buildpack=

if [[ -n "$BUILDPACK_URL" ]]; then
Expand Down Expand Up @@ -228,7 +228,7 @@ if [[ ! -f "$build_root/Procfile" ]]; then
fi

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

0 comments on commit e9c7faf

Please sign in to comment.