Skip to content

Commit

Permalink
rename unused Dockerfile.openshift to Dockerfile.art and update for c…
Browse files Browse the repository at this point in the history
…achito

Signed-off-by: Sam Batschelet <sbatsche@redhat.com>
  • Loading branch information
hexfusion committed Aug 11, 2021
1 parent bc92c91 commit a447088
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 20 deletions.
23 changes: 23 additions & 0 deletions Dockerfile.art
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-8-etcd-golang-1.16 AS builder

COPY $REMOTE_SOURCES $REMOTE_SOURCES_DIR
WORKDIR $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/app
RUN ls -lR $REMOTE_SOURCES_DIR
RUN cat $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/cachito.env
RUN source $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/cachito.env && GOFLAGS='-mod=readonly' GO_BUILD_FLAGS='-v' ./build.sh

RUN mkdir -p /go/src/go.etcd.io/
RUN ln -s $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/app /go/src/go.etcd.io/etcd

# stage 2 (note: any changes should reflect in Dockerfile.rhel)
FROM registry.ci.openshift.org/ocp/4.9:base

ENTRYPOINT ["/usr/bin/etcd"]

COPY --from=builder /go/src/go.etcd.io/etcd/bin/etcd /usr/bin/
COPY --from=builder /go/src/go.etcd.io/etcd/bin/etcdctl /usr/bin/
COPY --from=builder /go/src/go.etcd.io/etcd/bin/discover-etcd-initial-cluster /usr/bin/

LABEL io.k8s.display-name="etcd server" \
io.k8s.description="etcd is a distributed key-value store which stores the persistent master state for Kubernetes and OpenShift." \
maintainer="Sam Batschelet <sbatsche@redhat.com>"
19 changes: 0 additions & 19 deletions Dockerfile.openshift

This file was deleted.

2 changes: 1 addition & 1 deletion Dockerfile.rhel
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ COPY . .

RUN GOFLAGS='-mod=readonly' GO_BUILD_FLAGS='-v' ./build.sh

# stage 2
# stage 2 (note: any changes should reflect in Dockerfile.art)
FROM registry.ci.openshift.org/ocp/4.9:base

ENTRYPOINT ["/usr/bin/etcd"]
Expand Down

0 comments on commit a447088

Please sign in to comment.