Skip to content

Commit

Permalink
OKD-226: Dockerfile.rhel7: Add ARG TAGS=ocp
Browse files Browse the repository at this point in the history
Allow this ARG to be overriden by builds so that OKD builds may have the correct branding by default. OKD/SCOS builds pass the build-arg TAGS=scos so pkg/controllers/configobservation/oauth/brand_okd.go which has //go:build !ocp will be built instead of pkg/controllers/configobservation/oauth/brand_ocp.go which has //go:build ocp. This change should not affect the OCP build of the operator image.
  • Loading branch information
Prashanth684 committed Aug 28, 2024
1 parent dc429ef commit b36e699
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion Dockerfile.rhel7
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 AS builder
ARG TAGS=ocp
WORKDIR /go/src/github.com/openshift/cluster-authentication-operator
COPY . .
ENV GO_PACKAGE github.com/openshift/cluster-authentication-operator
RUN go build -ldflags "-X $GO_PACKAGE/pkg/version.versionFromGit=$(git describe --long --tags --abbrev=7 --match 'v[0-9]*')" -tags="ocp" -o authentication-operator ./cmd/authentication-operator
RUN go build -ldflags "-X $GO_PACKAGE/pkg/version.versionFromGit=$(git describe --long --tags --abbrev=7 --match 'v[0-9]*')" -tags="${TAGS}" -o authentication-operator ./cmd/authentication-operator

FROM registry.ci.openshift.org/ocp/4.16:base-rhel9
COPY --from=builder /go/src/github.com/openshift/cluster-authentication-operator/authentication-operator /usr/bin/
Expand Down

0 comments on commit b36e699

Please sign in to comment.