Skip to content

Commit

Permalink
Merge pull request #319 from oracle/sync_with_internal
Browse files Browse the repository at this point in the history 
Cherry pick commits from internal repo
  • Loading branch information
@mrunalpagnis
mrunalpagnis authored Aug 25, 2020
2 parents 89bc79c + 3884bc9 commit c5b87ae
Show file tree
Hide file tree
Showing 16,187 changed files with 462,309 additions and 3,853,694 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,4 @@ config.yaml
.wercker/

.idea/
*.iml
25 changes: 21 additions & 4 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,26 @@
# See the License for the specific language governing permissions and
# limitations under the License.

ARG CI_IMAGE_REGISTRY

FROM ${CI_IMAGE_REGISTRY}/oci-kube-ci:1.0.4

ARG COMPONENT

ENV SRC /go/src/github.com/oracle/oci-cloud-controller-manager

ENV GOPATH /go/
RUN mkdir -p /go/bin $SRC
ADD . $SRC
WORKDIR $SRC

RUN COMPONENT=${COMPONENT} make clean build

FROM oraclelinux:7-slim

COPY dist/oci-cloud-controller-manager /usr/local/bin/
COPY dist/oci-flexvolume-driver /usr/local/bin/
COPY dist/oci-volume-provisioner /usr/local/bin/
COPY image/* /usr/local/bin/
COPY --from=0 /go/src/github.com/oracle/oci-cloud-controller-manager/dist/* /usr/local/bin/
COPY --from=0 /go/src/github.com/oracle/oci-cloud-controller-manager/image/* /usr/local/bin/

RUN yum install -y iscsi-initiator-utils-6.2.0.874-10.0.5.el7 \
&& yum install -y e2fsprogs \
&& yum clean all
Loading

0 comments on commit c5b87ae

Please sign in to comment.