Skip to content

Commit

Permalink
Merge pull request #36 from adrianriobo/oci_crc_cloud
Browse files Browse the repository at this point in the history
crc-cloud container image with binary as entrypoint
  • Loading branch information
praveenkumar authored Mar 1, 2023
2 parents cb4020e + 15b6d95 commit 57b9194
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 62 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
VERSION ?= 0.0.1
VERSION ?= 0.0.2
CONTAINER_MANAGER ?= podman
# Image URL to use all building/pushing image targets
IMG ?= quay.io/crcont/crc-cloud:${VERSION}
IMG ?= quay.io/crcont/crc-cloud:v${VERSION}

# Go and compilation related variables
GOPATH ?= $(shell go env GOPATH)
Expand Down
14 changes: 6 additions & 8 deletions oci/Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ USER root
WORKDIR /workspace
COPY . .

ENV PULUMI_VERSION 3.51.0
ENV PULUMI_VERSION 3.54.0
ENV PULUMI_URL https://github.com/pulumi/pulumi/releases/download/v${PULUMI_VERSION}/pulumi-v${PULUMI_VERSION}-linux-x64.tar.gz

RUN apk -U upgrade \
Expand All @@ -19,14 +19,12 @@ FROM docker.io/library/alpine:3.17

LABEL MAINTAINER "CRC <devtools-cdk@redhat.com>"

COPY --from=builder /workspace/out/crc-cloud /workspace/pulumi/pulumi /workspace/oci/entrypoint.sh /usr/local/bin/
# https://www.pulumi.com/docs/reference/cli/environment-variables/
ENV PULUMI_CONFIG_PASSPHRASE "defaultPassphrase"

ENV INTERNAL_OUTPUT /tmp/crc-cloud
COPY --from=builder /workspace/out/crc-cloud /workspace/pulumi/pulumi /usr/local/bin/

VOLUME [ "${INTERNAL_OUTPUT}" ]

# libc6-compat
RUN apk add --update curl aws-cli qemu-img zstd bash \
&& mkdir -p "${INTERNAL_OUTPUT}"
&& pulumi plugin install resource command v0.7.0

ENTRYPOINT entrypoint.sh
ENTRYPOINT [ "crc-cloud" ]
52 changes: 0 additions & 52 deletions oci/entrypoint.sh

This file was deleted.

0 comments on commit 57b9194

Please sign in to comment.