Skip to content

Commit f7a9d2e

Browse files
Merge pull request openshift#566 from joshbranham/fix-license-copy
Cleanup make targets and fix LICENSE copy
2 parents d075a1f + 8cf0245 commit f7a9d2e

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

Makefile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,7 @@ subscriber-report: ## Discover onboarding and prow status of subscribed consumer
3535

3636
.PHONY: build-image-deep
3737
build-image-deep: ## Builds the image from scratch, like appsre does. May require ALLOW_DIRTY_CHECKOUT=true if testing
38-
cd config; $(CONTAINER_ENGINE) build -t $(IMG):latest -f Dockerfile .
39-
40-
.PHONY: build-image-shallow
41-
build-image-shallow: ## Builds the image starting from a recent release, like prow does. May require ALLOW_DIRTY_CHECKOUT=true if testing
42-
cd config; $(CONTAINER_ENGINE) build -t $(IMG):latest .
38+
$(CONTAINER_ENGINE) build -t $(IMG):latest -f config/Dockerfile .
4339

4440
.DEFAULT_GOAL := help
4541
.PHONY: help

config/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ RUN dnf -y install openssh-clients jq skopeo python3-pyyaml && \
5454
dnf -y autoremove && \
5555
rm -rf /var/cach/dnf
5656

57-
COPY LICENSE /licenses/.
57+
COPY LICENSE .
5858
ENV PATH=$PATH:/go/bin
5959

6060
# In CI, jobs run in this container with a really high UID generated by OCP. This user does

0 commit comments

Comments
 (0)