Skip to content

Commit a71bcbf

Browse files
committed
working dir of the buildpack task isthe halfpipe dir
1 parent 02a3560 commit a71bcbf

2 files changed

Lines changed: 6 additions & 9 deletions

File tree

e2e/concourse/buildpack/pipelineExpected.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ jobs:
3434
export GIT_REVISION=`cat ../../../.git/ref`
3535
echo $DOCKER_CONFIG_JSON > ~/.docker/config.json
3636
echo pack build eu.gcr.io/halfpipe-io/halfpipe-e2e-pact \
37-
--path e2e/concourse/buildpack \
37+
--path . \
3838
--builder paketobuildpacks/builder-jammy-buildpackless-base \
3939
--buildpack gcr.io/paketo-buildpacks/java:18.5.0 \
4040
--tag eu.gcr.io/halfpipe-io/halfpipe-e2e-pact:${GIT_REVISION} \
4141
--publish \
4242
--trust-builder
4343
4444
pack build eu.gcr.io/halfpipe-io/halfpipe-e2e-pact \
45-
--path e2e/concourse/buildpack \
45+
--path . \
4646
--builder paketobuildpacks/builder-jammy-buildpackless-base \
4747
--buildpack gcr.io/paketo-buildpacks/java:18.5.0 \
4848
--tag eu.gcr.io/halfpipe-io/halfpipe-e2e-pact:${GIT_REVISION} \
@@ -92,7 +92,7 @@ jobs:
9292
export GIT_REVISION=`cat ../../../.git/ref`
9393
echo $DOCKER_CONFIG_JSON > ~/.docker/config.json
9494
echo pack build eu.gcr.io/halfpipe-io/halfpipe-e2e-pact \
95-
--path e2e/concourse/buildpack/build/libs \
95+
--path build/libs \
9696
--builder paketobuildpacks/builder-jammy-buildpackless-base \
9797
--buildpack gcr.io/paketo-buildpacks/java:18.5.0 \
9898
--buildpack gcr.io/paketo-buildpacks/node:18.5.0 \
@@ -103,7 +103,7 @@ jobs:
103103
--trust-builder
104104
105105
pack build eu.gcr.io/halfpipe-io/halfpipe-e2e-pact \
106-
--path e2e/concourse/buildpack/build/libs \
106+
--path build/libs \
107107
--builder paketobuildpacks/builder-jammy-buildpackless-base \
108108
--buildpack gcr.io/paketo-buildpacks/java:18.5.0 \
109109
--buildpack gcr.io/paketo-buildpacks/node:18.5.0 \

renderers/concourse/buildpack.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,9 @@ func packScriptArgs(task manifest.Buildpack, man manifest.Manifest, basePath str
9191
versionTag = fmt.Sprintf("--tag %s:${BUILD_VERSION} ", task.Image)
9292
}
9393

94-
appPath := basePath
95-
if appPath == "" {
96-
appPath = "."
97-
}
94+
appPath := "."
9895
if len(task.Path) > 0 {
99-
appPath = path.Join(appPath, task.Path)
96+
appPath = task.Path
10097
}
10198

10299
out = append(out, `echo $DOCKER_CONFIG_JSON > ~/.docker/config.json`)

0 commit comments

Comments
 (0)